From b87308e14f54e71a68979d1d86d656e78329e063 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Tue, 24 May 2022 18:40:59 +0400
Subject: [PATCH] Merge conflict fix.

---
 frontend/src/app/app-routing.module.ts   | 4 ----
 frontend/src/app/shared/shared.module.ts | 8 ++++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index dfcc7aec7..564b8653b 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -20,7 +20,6 @@ import { AssetsFeaturedComponent } from './components/assets/assets-featured/ass
 import { AssetsComponent } from './components/assets/assets.component';
 import { AssetComponent } from './components/asset/asset.component';
 import { AssetsNavComponent } from './components/assets/assets-nav/assets-nav.component';
-import { LightningDashboardComponent } from './lightning/lightning-dashboard/lightning-dashboard.component';
 
 let routes: Routes = [
   { 
@@ -99,7 +98,6 @@ let routes: Routes = [
           },
           {
             path: 'lightning',
-            component: LightningDashboardComponent,
             loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule)
           },
         ],
@@ -194,7 +192,6 @@ let routes: Routes = [
           },
           {
             path: 'lightning',
-            component: LightningDashboardComponent,
             loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule)
           },
         ],
@@ -286,7 +283,6 @@ let routes: Routes = [
       },
       {
         path: 'lightning',
-        component: LightningDashboardComponent,
         loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule)
       },
     ],
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 7e8914000..bbcba71c0 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -4,7 +4,7 @@ import { NgbCollapse, NgbCollapseModule, NgbRadioGroup, NgbTypeaheadModule } fro
 import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome';
 import { faFilter, faAngleDown, faAngleUp, faAngleRight, faAngleLeft, faBolt, faChartArea, faCogs, faCubes, faHammer, faDatabase, faExchangeAlt, faInfoCircle,
   faLink, faList, faSearch, faCaretUp, faCaretDown, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faSortUp, faAngleDoubleUp, faChevronDown,
-  faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt, faBook, faListUl, faDownload } from '@fortawesome/free-solid-svg-icons';
+  faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt, faBook, faListUl, faDownload, faQrcode } from '@fortawesome/free-solid-svg-icons';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { MasterPageComponent } from '../components/master-page/master-page.component';
 import { BisqMasterPageComponent } from '../components/bisq-master-page/bisq-master-page.component';
@@ -75,6 +75,7 @@ import { IndexingProgressComponent } from '../components/indexing-progress/index
 import { SvgImagesComponent } from '../components/svg-images/svg-images.component';
 import { ChangeComponent } from '../components/change/change.component';
 import { SatsComponent } from './components/sats/sats.component';
+import { SearchResultsComponent } from '../components/search-form/search-results/search-results.component';
 
 @NgModule({
   declarations: [
@@ -144,6 +145,7 @@ import { SatsComponent } from './components/sats/sats.component';
     SvgImagesComponent,
     ChangeComponent,
     SatsComponent,
+    SearchResultsComponent,
   ],
   imports: [
     CommonModule,
@@ -240,7 +242,8 @@ import { SatsComponent } from './components/sats/sats.component';
     IndexingProgressComponent,
     SvgImagesComponent,
     ChangeComponent,
-    SatsComponent
+    SatsComponent,
+    SearchResultsComponent,
   ]
 })
 export class SharedModule {
@@ -279,5 +282,6 @@ export class SharedModule {
     library.addIcons(faBook);
     library.addIcons(faListUl);
     library.addIcons(faDownload);
+    library.addIcons(faQrcode);
   }
 }