From 7bc0be3b5d23f9eae5a462a448ee6c97acc50ba0 Mon Sep 17 00:00:00 2001
From: seajamied <jdegnan@chef.io>
Date: Mon, 18 May 2020 12:18:59 -0700
Subject: [PATCH] Merge conflict marker cleanup

---
 .../check-in-time-series.component.html       | 19 ---------
 .../dashboard/dashboard.component.html        | 41 -------------------
 .../src/app/modules/desktop/desktop.module.ts |  6 ---
 3 files changed, 66 deletions(-)

diff --git a/components/automate-ui/src/app/modules/desktop/check-in-time-series/check-in-time-series.component.html b/components/automate-ui/src/app/modules/desktop/check-in-time-series/check-in-time-series.component.html
index 1e316acbb432..24f354d4cdec 100644
--- a/components/automate-ui/src/app/modules/desktop/check-in-time-series/check-in-time-series.component.html
+++ b/components/automate-ui/src/app/modules/desktop/check-in-time-series/check-in-time-series.component.html
@@ -1,5 +1,4 @@
 <div class="content-container">
-<<<<<<< HEAD
   <div class="header">
     <div class="heading">
       <h2 class="heading-title">Check-in History</h2>
@@ -11,24 +10,6 @@ <h6 class="heading-time">Updated {{ lastUpdatedMessage }}</h6>
         Last {{ selectableDaysAgo }} Days
       </option>
     </select>
-=======
-  <div class="container">
-    <main>
-      <div class="page-title">Last Check-in by Day</div>
-      <div class="update-time">Updated {{ lastUpdatedMessage }}</div>
-      <div>
-        <select (change)="dateChanged($event.target.value)">
-          <option *ngFor="let selectableDaysAgo of selectableDaysAgoCollection"
-            [value]="selectableDaysAgo" [selected]="selectableDaysAgo == selectedDaysAgo">
-            Last {{ selectableDaysAgo }} Days
-          </option>
-        </select>
-      </div>
-
-      <app-simple-line-graph [data]="days"></app-simple-line-graph>
-
-    </main>
->>>>>>> Making progress, data is showing but being overwritten, x axis are up, everything is unstyled
   </div>
 
   <app-simple-line-graph [data]="days"></app-simple-line-graph>
diff --git a/components/automate-ui/src/app/modules/desktop/dashboard/dashboard.component.html b/components/automate-ui/src/app/modules/desktop/dashboard/dashboard.component.html
index 43d0db5e6942..4ec82172fbf7 100644
--- a/components/automate-ui/src/app/modules/desktop/dashboard/dashboard.component.html
+++ b/components/automate-ui/src/app/modules/desktop/dashboard/dashboard.component.html
@@ -1,5 +1,4 @@
 <div class="content-container">
-<<<<<<< HEAD
   <div
     class="dashboard-grid"
     [ngClass]="{
@@ -88,45 +87,5 @@ <h1>
         </app-desktop-detail>
       </div>
     </div>
-=======
-  <div class="container">
-    <main>
-      <app-insight
-        [visible] = "insightVisible"
-        [desktops] = "desktops$ | async"
-        [totalDesktops] = "totalDesktopCount$ | async"
-        [pageSize] = "pageSize$ | async"
-        [currentPage] = "currentPage$ | async"
-        [termFilters] = "termFilters$ | async"
-        (pageChange)="onPageChange($event)"
-        (termFilterSelected)="onTermFilterSelected($event)"
-        (closed)="insightClose()"
-        (sortChange)="onSortChange($event)">
-      </app-insight>
-      <app-top-errors
-        [topErrorsItems] = "topErrorsItems$ | async"
-        [lastUpdated] = "topErrorsUpdated$ | async"
-        (errorSelected)="onErrorSelected($event)">
-      </app-top-errors>
-      <app-daily-check-in
-        [unknownPercentage] = "unknownPercentage$ | async"
-        [checkedInPercentage] = "checkedInPercentage$ | async"
-        [totalCount] = "totalCount$ | async"
-        [unknownCount] = "unknownCount$ | async"
-        [lastUpdated] = "checkInCountCollectedUpdated$ | async"
-        [checkedInCount] = "checkedInCount$ | async">
-      </app-daily-check-in>
-      <app-check-in-time-series
-        [days] = "days$ | async"
-        [selectedDaysAgo] = "selectedDaysAgo$ | async"
-        [lastUpdated] = "checkInCountCollectedUpdated$ | async"
-        (daysAgoChanged)="handleDaysAgoChange($event)">
-      </app-check-in-time-series>
-      <app-unknown-desktop-duration-counts
-        [countedDurationItems] = "unknownDesktopCountedDurationItems$ | async"
-        [lastUpdated] = "unknownDesktopCountedDurationUpdated$ | async">
-      </app-unknown-desktop-duration-counts>
-    </main>
->>>>>>> Revert temp file change
   </div>
 </div>
diff --git a/components/automate-ui/src/app/modules/desktop/desktop.module.ts b/components/automate-ui/src/app/modules/desktop/desktop.module.ts
index 311ea5f17d39..d619512394bf 100644
--- a/components/automate-ui/src/app/modules/desktop/desktop.module.ts
+++ b/components/automate-ui/src/app/modules/desktop/desktop.module.ts
@@ -39,13 +39,7 @@ import { DesktopRoutingModule } from './desktop-routing.module';
     CheckInTimeSeriesComponent,
     DailyCheckInComponent,
     DashboardComponent,
-<<<<<<< HEAD
     DesktopDetailComponent,
-    CheckInTimeSeriesComponent,
-    TopErrorsComponent,
-    UnknownDesktopDurationCountsComponent,
-=======
->>>>>>> Alphabetize imports
     InsightComponent,
     SimpleLineGraphComponent,
     TopErrorsComponent,