fix

Author: Gorniv

package.json

@@ -46,6 +46,7 @@
         "@angular/cli": "1.6.0-beta.0",
         "@angular/compiler-cli": "5.0.1",
         "@angular/language-service": "5.0.1",
+        "@angular/material": "5.0.0-rc0",
         "@angular/platform-server": "5.0.1",
         "@types/jasmine": "2.8.0",
         "@types/jasminewd2": "2.0.3",

src/app/app.component.html

@@ -1,13 +1,7 @@
 <nav>
     <ul>
         <li><a [routerLink]="['']" [routerLinkActive]="['router-link-active']">home</a></li>
-<<<<<<< HEAD
         <li><a [routerLink]="['/material']" [routerLinkActive]="['router-link-active']">material</a></li>
-        <li><a [routerLink]="['/back']" [routerLinkActive]="['router-link-active']">back</a></li>
-=======
-        <li><a [routerLink]="['/mock']" [routerLinkActive]="['router-link-active']">mock</a></li>
-        <li><a [routerLink]="['/back']" [routerLinkActive]="['router-link-active']">back http</a></li>
->>>>>>> master
     </ul>
 </nav>
 <router-outlet></router-outlet>

src/app/app.routing.ts

@@ -3,7 +3,6 @@ import { Routes, RouterModule } from '@angular/router';
 const routes: Routes = [
   { path: '', loadChildren: './home/home.module#HomeModule', pathMatch: 'full' },
   { path: 'material', loadChildren: './materialPage/materialPage.module#MaterialPageModule' },
-  { path: 'back', loadChildren: './transfer-back/transfer-back.module#TransferBackModule' },
 ];
 // must use {initialNavigation: 'enabled'}) - for one load page, without reload
 export const AppRoutes = RouterModule.forRoot(routes, { initialNavigation: 'enabled' });