diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index d6f5ccd7..3a2dbe2b 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -61,15 +61,11 @@
-

{{companyDesc}}

+
@@ -117,7 +113,6 @@ -<<<<<<< HEAD @@ -157,35 +152,14 @@
-

{{companyDesc}}

+
-======= - - - - - {{ts.trPK('login','changepassword')}} - {{notBadge}} - -
- ->>>>>>> 25ada829dfd1fa6b65bb611ae62c30323e18f3f7 - -
- -

{{companyDesc}}

-
- - -