Noded/frontend
3
0
Fork 0
Code Issues 47 Pull Requests Releases Wiki Activity

fix missed merge conflict

Browse Source
This commit is contained in:
garrettmills
2020-02-08 15:35:06 -06:00
parent e90b375d02
commit 732dfa4256
2 changed files with 6 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/app.component.html
View File

@@ -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>
</ion-app>