CI

angular-client/src/app/components/shared/navbar/navbar.component.html

@@ -22,13 +22,8 @@
       <a class="navbtn" mat-button routerLink="/statistique" [hidden]="!isAdmin">Statistique</a>
       <a class="navbtn" mat-button routerLink="/emailing" [hidden]="!isAdmin">Emailing</a>
       <a class="navbtn" mat-button routerLink="/assistance" [hidden]="!isAdmin">Assistance</a>
-<<<<<<< HEAD
-      <a class="navbtn" mat-button routerLink="/users" [hidden]="!isAdmin">Employés</a>
-      <a class="navbtn" mat-button routerLink="/login" >Contact</a>
-=======
       <!-- <a class="navbtn" mat-button routerLink="/users" [hidden]="!isAdmin">Employés</a> -->
       <a class="navbtn" mat-button routerLink="/contact" *ngIf="!isLogged && !isAdmin" >Contact</a>
->>>>>>> dev
       <a class="navbtn" mat-icon-button color="basic" aria-label="" (click)="logOut()" *ngIf="isLogged">
         <mat-icon>power_settings_new</mat-icon>
       </a>