rebased?

Author: Only1MrAnderson

src/app/app.component.html

@@ -10,13 +10,7 @@
   <mat-sidenav-container>
     <mat-sidenav #sidenav>
       <mat-nav-list (click)="sidenav.toggle()">
-<<<<<<< HEAD
         <a *ngFor="let menu of menus" mat-list-item routerLinkActive="active" [routerLinkActiveOptions]="menu.options" [routerLink]="menu.link">
-=======
-        <a *ngFor="let menu of menus" mat-list-item routerLinkActive="active"
-          [routerLinkActiveOptions]="menu.options"
-          [routerLink]="menu.link">
->>>>>>> dc33074... Update angular material prefix to mat and lock down package versions
          {{menu.title}}
         </a>
       </mat-nav-list>