冲突修正

fengxiang

2018-03-13 936bb39145eee86530f61d3345f8125ddd778225

冲突修正

 src/app/routes/routes-routing.module.ts

@@ -20,14 +20,10 @@
        component: LayoutDefaultComponent,
        children: [
            { path: '', redirectTo: 'dashboard/workplace', pathMatch: 'full' },
<<<<<<< HEAD
            { path: 'dashboard', redirectTo: 'dashboard/workplace', pathMatch: 'full' },
=======
            { path: 'dashboard', redirectTo: 'dashboard/v1', pathMatch: 'full' },
            { path: 'dashboard/v1', component: DashboardV1Component, data: { translate: 'dashboard_v1' } },
            { path: 'dashboard/analysis', component: DashboardAnalysisComponent, data: { translate: 'dashboard_analysis' } },
            { path: 'dashboard/monitor', component: DashboardMonitorComponent, data: { translate: 'dashboard_monitor' } },
>>>>>>> 9634327c9094fb2d2b5bb2a3e630971cd65d3112
            { path: 'dashboard/workplace', component: DashboardWorkplaceComponent, data: { translate: 'dashboard_workplace' } },
            { path: 'users', loadChildren: './users/users.module#UsersModule' },
            { path: 'devices', loadChildren: './devices/devices.module#DevicesModule' },