From 21d23ec9e72a20de0a101a9ad4f6ba06ea72c26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=87etin?=
 <69278826+cetincakiroglu@users.noreply.github.com>
Date: Fri, 7 Jan 2022 16:17:00 +0300
Subject: [PATCH] fix conflict

---
 src/app/app.module.ts                           |  5 +----
 src/app/components/landing/landing.component.ts | 10 +++++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index f29be03..921816c 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -125,6 +125,7 @@ import { PaymentComponent} from './components/menus/payment.component';
 import { ConfirmationComponent } from './components/menus/confirmation.component';
 import { PersonalComponent } from './components/menus/personal.component';
 import { SeatComponent } from './components/menus/seat.component';
+import { LandingComponent } from './components/landing/landing.component';
 
 import { CountryService } from './service/countryservice';
 import { CustomerService } from './service/customerservice';
@@ -134,11 +135,7 @@ import { NodeService } from './service/nodeservice';
 import { PhotoService } from './service/photoservice';
 import { ProductService } from './service/productservice';
 import { MenuService } from './service/app.menu.service';
-<<<<<<< HEAD
-import { LandingComponent } from './components/landing/landing.component';
-=======
 import { ConfigService } from './service/app.config.service';
->>>>>>> ffd58ddc301f2db09fb646ebb6e97e77fc2ab70e
 
 @NgModule({
     imports: [
diff --git a/src/app/components/landing/landing.component.ts b/src/app/components/landing/landing.component.ts
index 61fa5ca..4bcb679 100644
--- a/src/app/components/landing/landing.component.ts
+++ b/src/app/components/landing/landing.component.ts
@@ -1,16 +1,24 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 @Component({
   selector: 'app-landing',
   templateUrl: './landing.component.html',
   styleUrls: ['./landing.component.scss']
 })
 export class LandingComponent implements OnInit {
+  
+  themeElement: any;
 
   constructor() { }
 
   ngOnInit(): void {
     let themeElement = document.getElementById('theme-css');
+    this.themeElement = document.getElementById('theme-css');
+    console.log(this.themeElement);
     themeElement.setAttribute('href','assets/theme/saga-blue/theme.css');
   }
 
+  ngOnDestroy(): void {
+
+  }
+
 }