fix conflict

open-learning-exchange · Dec 18, 2019 · e611330 · e611330
1 parent 722732d
commit e611330
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/app/health/health.component.html b/src/app/health/health.component.html
@@ -5,7 +5,6 @@
 </mat-toolbar>
 
 <div class="space-container">
-<<<<<<< HEAD
   <mat-toolbar class="primary-color font-size-1 action-buttons">
     <a mat-raised-button color="accent" i18n [routerLink]="['update']" *ngIf="isOwnUser">Update Details</a>
     <a mat-raised-button color="accent" i18n [routerLink]="['event', { id: userDetail._id }]">Add Examination</a>