machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge conflict fix.

Browse Source
This commit is contained in:
softsimon
2022-05-24 18:40:59 +04:00
parent 6e2b1d633b
commit 30bf725020
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/app/app-routing.module.ts
View File

@@ -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)
},
],