From 97f608927208b479f2cb244777a68d238bfb3707 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Mon, 23 Mar 2020 18:05:32 +0300 Subject: [PATCH] fix conflict in login componemt --- Mohem/src/app/authentication/login/login.component.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index a1e9c6cd..08179d5e 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -95,14 +95,6 @@ export class LoginComponent implements OnInit, OnDestroy { private checkUserResult: CheckUserAuthenticationResponse; ngOnInit() { -<<<<<<< HEAD - this.cs.stopLoading(); - // tslint:disable-next-line: triple-equals - if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { - this.language = 'US'; - } else { - this.language = 'AR'; -======= this.currentLang = TranslatorService.getCurrentLanguageCode(); console.log(TranslatorService.CURRENT_LANGUAGE) console.log(TranslatorService.EN) @@ -112,7 +104,6 @@ export class LoginComponent implements OnInit, OnDestroy { } else { this.language = "AR"; this.changeLanguage('1') ->>>>>>> master-newdesign } console.log("current lang: "+this.currentLang) //this.ts.switchLanguage();