diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 595c1dc0..03ed27de 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -2,12 +2,7 @@ {{ts.trPK('myTeam','myTeam-header')}} -<<<<<<< HEAD - - -======= ->>>>>>> master-newdesign -->