From 732dfa4256fbb9d17764b059a091fe17f026fb24 Mon Sep 17 00:00:00 2001
From: garrettmills <garrett@garrettmills.dev>
Date: Sat, 8 Feb 2020 15:35:06 -0600
Subject: [PATCH] fix missed merge conflict

---
 src/app/app.component.html  | 14 +---------
 src/app/home/home.page.html | 53 ++++---------------------------------
 2 files changed, 6 insertions(+), 61 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 1623cf6..8b9c091 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -12,21 +12,9 @@
           <ion-list-header>
             Navigate
             <ion-buttons class="ion-padding-end">
-<<<<<<< HEAD
-              <ion-button fill="outline" color="light">
-                <ion-icon color="primary" name="add-circle"></ion-icon>
-              </ion-button>
-              <ion-button fill="outline" color="light">
-                <ion-icon color="primary" name="add-circle"></ion-icon>&nbsp;<span style="color: #666;">Child</span>
-              </ion-button>
-              <ion-button fill="outline" color="light">
-                <ion-icon color="danger" name="trash"></ion-icon>
-              </ion-button>
-=======
               <ion-button fill="outline" color="light" (click)="onTopLevelCreate()"><ion-icon color="primary" name="add-circle"></ion-icon></ion-button>
               <ion-button fill="outline" color="light" (click)="onChildCreate()" [disabled]="!addChildTarget"><ion-icon color="primary" name="add-circle"></ion-icon>&nbsp;<span style="color: #666;">Child</span></ion-button>
               <ion-button fill="outline" color="light" (click)="onDeleteClick()" [disabled]="!deleteTarget"><ion-icon color="danger" name="trash"></ion-icon></ion-button>
->>>>>>> enable delete of pages
             </ion-buttons>
           </ion-list-header>
 
@@ -51,4 +39,4 @@
       </ion-content>
     </div>
   </ion-split-pane>
-</ion-app>
\ No newline at end of file
+</ion-app>
diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 29ca99b..4a8b354 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -1,48 +1,5 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-menu-button></ion-menu-button>
-    </ion-buttons>
-    <ion-title>
-      Home
-    </ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ion-card class="welcome-card">
-    <img src="/assets/shapes.svg" alt=""/>
-    <ion-card-header>
-      <ion-card-subtitle>Get Started</ion-card-subtitle>
-      <ion-card-title>Welcome to Ionic</ion-card-title>
-    </ion-card-header>
-    <ion-card-content>
-      <p>
-        Now that your app has been created, you'll want to start building out features
-        and components. Check out some of the resources below for next steps.
-      </p>
-    </ion-card-content>
-  </ion-card>
-
-  <ion-list lines="none">
-    <ion-list-header>
-      <ion-label>Resources</ion-label>
-    </ion-list-header>
-    <ion-item href="https://ionicframework.com/docs/">
-      <ion-icon slot="start" color="medium" name="book"></ion-icon>
-      <ion-label>Ionic Documentation</ion-label>
-    </ion-item>
-    <ion-item href="https://ionicframework.com/docs/building/scaffolding">
-      <ion-icon slot="start" color="medium" name="build"></ion-icon>
-      <ion-label>Scaffold Out Your App</ion-label>
-    </ion-item>
-    <ion-item href="https://ionicframework.com/docs/layout/structure">
-      <ion-icon slot="start" color="medium" name="grid"></ion-icon>
-      <ion-label>Change Your App Layout</ion-label>
-    </ion-item>
-    <ion-item href="https://ionicframework.com/docs/theming/basics">
-      <ion-icon slot="start" color="medium" name="color-fill"></ion-icon>
-      <ion-label>Theme Your App</ion-label>
-    </ion-item>
-  </ion-list>
-</ion-content>
+<ion-grid style="height: 100%; justify-content: center;">
+  <ion-row align-items-center>
+    <ion-col>Hi, there! Select or create a page to get started.</ion-col>
+  </ion-row>
+</ion-grid>