handle build --prod issue

6 years ago · 9138bfe744
parent 41472e61a3
commit 9138bfe744
1 changed files with 0 additions and 5 deletions
--- a/Mohem/src/app/my-team/home/home.component.html
+++ b/Mohem/src/app/my-team/home/home.component.html
@ -2,12 +2,7 @@
  <ion-toolbar class="header-toolbar-new">
    <ion-title color="light">{{ts.trPK('myTeam','myTeam-header')}}</ion-title>
      <ion-buttons slot="start">
-<<<<<<< HEAD
-        <nav-buttons backLink="/home"></nav-buttons>
-        <!-- <nav-buttons></nav-buttons> -->
-=======
        <nav-buttons></nav-buttons>
->>>>>>> master-newdesign
      </ion-buttons>
  </ion-toolbar>
 </ion-header> -->