Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
This commit is contained in:
commit
fc0dc67d0e
3 changed files with 554 additions and 52 deletions
|
|
@ -57,7 +57,7 @@
|
|||
"reflect-metadata": "0.1.13",
|
||||
"rxjs": "6.4.0",
|
||||
"rxjs-compat": "6.4.0",
|
||||
"selectize": "0.12.4-cg.10",
|
||||
"selectize": "0.12.4-cg.11",
|
||||
"systemjs": "0.21.4",
|
||||
"systemjs-plugin-babel": "0.0.25",
|
||||
"tslib": "1.9.3",
|
||||
|
|
|
|||
|
|
@ -15,10 +15,9 @@ const webbpmRoutes: Routes = [
|
|||
},
|
||||
{
|
||||
path: '',
|
||||
loadChildren: 'generated-sources/page-main.module#PagemainModule',
|
||||
loadChildren: 'generated-sources/page-conversion.module#PageconversionModule',
|
||||
canActivate: [ConfirmExitGuard, RolesGuard],
|
||||
pathMatch: 'full',
|
||||
|
||||
},
|
||||
{
|
||||
path: '**',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue