actual merge conflict resolving

code/moya-angular/e2e/app.po.ts

@@ -6,6 +6,6 @@ export class MoyaAngularPage {
   }
 
   getParagraphText() {
-    return element(by.css('app-root h1')).getText();
+    return element(by.css('moya-root h1')).getText();
   }
 }

code/moya-angular/src/app/app.component.js

@@ -23,7 +23,7 @@ var AppComponent = (function () {
     }
     AppComponent = __decorate([
         core_1.Component({
-            selector: 'app-root',
+            selector: 'moya-root',
             templateUrl: './app.component.html',
             styleUrls: ['./app.component.css']
         })

code/moya-angular/src/app/app.module.ts

 import {BrowserModule} from '@angular/platform-browser';
 import {Injector, NgModule, ReflectiveInjector} from '@angular/core';
 import {FormsModule} from '@angular/forms';
-
 import {AppComponent} from './app.component';
 import {ViplistComponent} from './viplist/viplist.component';
 import {AlertModule} from 'ngx-bootstrap';
-
-
 import { Router, RouterModule, PreloadAllModules} from '@angular/router';
 import {OldMoyaComponent} from './pages/old-moya/old-moya.component';
 import {TestComponent} from './test/test.component';
@@ -23,7 +20,6 @@ import {CacheService} from "./shared/services/cache.service";
 import {MoyaRestModule} from "./moya-rest";
 import {SafePipe} from "./shared/pipes/safe.pipe";
 import { AppRoutingModule } from './app-routing.module';
-<<<<<<< HEAD
 import { LoginComponent } from './pages/login/login.component';
 
 @NgModule({
@@ -33,30 +29,6 @@ import { LoginComponent } from './pages/login/login.component';
     AppComponent
   ],
   imports: [
-=======
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    RouterModule,
-    ViplistComponent,
-    OldMoyaComponent,
-    TestComponent,
-    TopMenuComponent,
-    LeftMenuComponent,
-    AdminMenuComponent,
-    InfoMenuComponent,
-    UserMenuComponent,
-    UserComponent,
-    InfoComponent,
-    AdminComponent,
-    SafePipe
-
-  ],
-  imports: [
-    AppRoutingModule,
-    CommonModule,
->>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885
     BrowserModule,
     AppRoutingModule,
     CommonModule,

code/moya-angular/src/app/menu/admin-menu/admin-menu.component.ts

@@ -3,7 +3,7 @@ import {MenuGroup} from '../models/menu-group.model';
 import {MENU} from '../defines/menu';
 
 @Component({
-  selector: 'app-admin-menu',
+  selector: 'moya-admin-menu',
   templateUrl: './admin-menu.component.html',
   styleUrls: ['./admin-menu.component.scss']
 })

code/moya-angular/src/app/menu/info-menu/info-menu.component.ts

@@ -3,7 +3,7 @@ import {MenuGroup} from '../models/menu-group.model';
 import {MENU} from '../defines/menu';
 
 @Component({
-  selector: 'app-info-menu',
+  selector: 'moya-info-menu',
   templateUrl: './info-menu.component.html',
   styleUrls: ['./info-menu.component.scss']
 })

code/moya-angular/src/app/menu/user-menu/user-menu.component.ts

@@ -3,7 +3,7 @@ import {MenuGroup} from '../models/menu-group.model';
 import {MENU} from '../defines/menu';
 
 @Component({
-  selector: 'app-user-menu',
+  selector: 'moya-user-menu',
   templateUrl: './user-menu.component.html',
   styleUrls: ['./user-menu.component.scss']
 })

code/moya-angular/src/app/pages/admin/admin-routing.module.ts

@@ -11,3 +11,4 @@ const routes: Routes = [
   exports: [RouterModule]
 })
 export class AdminRoutingModule { }
+

code/moya-angular/src/app/pages/admin/admin.component.ts

 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'app-admin',
+  selector: 'moya-admin',
   templateUrl: './admin.component.html',
   styleUrls: ['./admin.component.scss']
 })

code/moya-angular/src/app/pages/admin/admin.module.ts

 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-<<<<<<< HEAD
 import { AdminRoutingModule } from './admin-routing.module';
 import { AdminComponent } from './admin.component';
-=======
-
-import { AdminRoutingModule } from './admin-routing.module';
->>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885
 
 @NgModule({
   imports: [
     CommonModule,
     AdminRoutingModule
   ],
-<<<<<<< HEAD
   declarations: [AdminComponent]
-=======
-  declarations: []
->>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885
 })
 export class AdminModule { }

code/moya-angular/src/app/pages/info/info.component.ts

 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'app-info',
+  selector: 'moya-info',
   templateUrl: './info.component.html',
   styleUrls: ['./info.component.scss']
 })

code/moya-angular/src/app/pages/info/info.module.ts

 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-<<<<<<< HEAD
 import { InfoRoutingModule } from './info-routing.module';
 import { InfoComponent } from './info.component';
-=======
-
-import { InfoRoutingModule } from './info-routing.module';
->>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885
 
 @NgModule({
   imports: [
     CommonModule,
     InfoRoutingModule
   ],
-<<<<<<< HEAD
   declarations: [InfoComponent]
-=======
-  declarations: []
->>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885
 })
 export class InfoModule { }

code/moya-angular/src/app/pages/login/login.component.html

-<<<<<<< HEAD
 <div id="top-container">
   <div id="left-menu">
  <!--    <router-outlet name="left-menu"></router-outlet> -->
@@ -14,8 +13,3 @@
     </div>
   </div>
 </div>
-=======
-<p>
-  login works!
-</p>
->>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885

code/moya-angular/src/app/pages/old-moya/old-moya.component.js

@@ -24,7 +24,7 @@ var OldMoyaComponent = (function () {
     ], OldMoyaComponent.prototype, "frametus", void 0);
     OldMoyaComponent = __decorate([
         core_1.Component({
-            selector: 'app-old-moya',
+            selector: 'moya-old-moya',
             providers: [common_1.Location, { provide: common_1.LocationStrategy, useClass: common_1.PathLocationStrategy }],
             templateUrl: './old-moya.component.html',
             styleUrls: ['./old-moya.component.css']

code/moya-angular/src/app/pages/user/user-routing.module.ts

@@ -3,7 +3,7 @@ import { Routes, RouterModule } from '@angular/router';
 import { UserComponent } from './user.component';
 
 const routes: Routes = [
-  { path: 'info', component: UserComponent }
+  { path: 'user', component: UserComponent }
 ];
 
 @NgModule({

code/moya-angular/src/app/pages/user/user.component.ts

 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'app-user',
+  selector: 'moya-user',
   templateUrl: './user.component.html',
   styleUrls: ['./user.component.scss']
 })

code/moya-angular/src/app/test/test.component.js

@@ -20,7 +20,7 @@ var TestComponent = (function () {
     ], TestComponent.prototype, "counter", void 0);
     TestComponent = __decorate([
         core_1.Component({
-            selector: 'app-test',
+            selector: 'moya-test',
             templateUrl: './test.component.html',
             styleUrls: ['./test.component.css']
         })

code/moya-angular/src/app/test/test.component.ts

 import {Component, OnInit, Input} from '@angular/core';
 
 @Component({
-  selector: 'app-test',
+  selector: 'moya-test',
   templateUrl: './test.component.html',
   styleUrls: ['./test.component.scss']
 })