|
@@ -6,12 +6,6 @@ const routes: Routes = [
|
|
|
path: '',
|
|
|
loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
- {
|
|
|
- path: 'calendar',
|
|
|
- loadChildren: () => import('./calendar/calendar.module').then( m => m.CalendarPageModule)
|
|
|
- },
|
|
|
-
|
|
|
{
|
|
|
path: 'user',
|
|
|
loadChildren: () => import('../modules/user/user.module').then(m => m.UserModule)
|
|
@@ -24,24 +18,6 @@ const routes: Routes = [
|
|
|
path: 'bounty-store',
|
|
|
loadChildren: () => import('../app/bounty-store/bounty-store.module').then(mod => mod.BountyStorePageModule)
|
|
|
},
|
|
|
-=======
|
|
|
-
|
|
|
-
|
|
|
- {
|
|
|
- path: 'user',
|
|
|
- loadChildren: () => import('../modules/user/user.module').then(m => m.UserModule)
|
|
|
- },
|
|
|
- {
|
|
|
- path: "tree",
|
|
|
- loadChildren: () => import('../modules/tab/tree/tree.module').then(m => m.TreePageModule)
|
|
|
- },
|
|
|
- {
|
|
|
- path: 'memo',
|
|
|
- loadChildren: () => import('./memo/memo.module').then( m => m.MemoPageModule)
|
|
|
- },
|
|
|
-
|
|
|
-
|
|
|
->>>>>>> dev
|
|
|
|
|
|
];
|
|
|
@NgModule({
|