fix conflict

open-learning-exchange · Mar 19, 2020 · 48c2d38 · 48c2d38
1 parent f811241
commit 48c2d38
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>