add

NickIliev · Jun 20, 2019 · fc9b85a · fc9b85a
1 parent d607eb2
commit fc9b85a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/app/app.component.ts b/app/app.component.ts
@@ -31,11 +31,9 @@ declare let TKSideDrawerShadowModeHostview: any;
     styleUrls: ["./app.component.css"]
 })
 export class AppComponent implements OnInit, AfterViewInit {
-<<<<<<< HEAD
+
     @ViewChild(RadSideDrawerComponent, {static: false}) drawerComponent: RadSideDrawerComponent;
-=======
-    @ViewChild(RadSideDrawerComponent, { static: false }) drawerComponent: RadSideDrawerComponent;
->>>>>>> 33b0226d2f2e362eaa631c4c052b8c538168e8ca
+
     private _drawer: RadSideDrawer;
     isUserLogged: boolean = false; // hide & show LOGOUT button option