Merge 9d658c8 into 8c01b71

mtlynch · Apr 30, 2018 · 935ffea · 935ffea
2 parents 8c01b71 + 9d658c8
commit 935ffea
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, async } from '@angular/core/testing';
 import { AppComponent } from './app.component';
-import { HomePageComponent } from './public/home-page/home-page/home-page.component';
+import { HomePageComponent } from './public/home-page/home-page.component';
 
 describe('AppComponent', () => {
   beforeEach(async(() => {

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -4,7 +4,7 @@ import { NgModule } from '@angular/core';
 import { AppComponent } from './app.component';
 
 // Public pages
-import { HomePageComponent } from './public/home-page/home-page/home-page.component';
+import { HomePageComponent } from './public/home-page/home-page.component';
 
 @NgModule({
   declarations: [

diff --git a/...e-page/home-page/home-page.component.html → ...public/home-page/home-page.component.html b/...e-page/home-page/home-page.component.html → ...public/home-page/home-page.component.html
diff --git a/...e-page/home-page/home-page.component.scss → ...public/home-page/home-page.component.scss b/...e-page/home-page/home-page.component.scss → ...public/home-page/home-page.component.scss
diff --git a/...age/home-page/home-page.component.spec.ts → ...lic/home-page/home-page.component.spec.ts b/...age/home-page/home-page.component.spec.ts → ...lic/home-page/home-page.component.spec.ts
diff --git a/...ome-page/home-page/home-page.component.ts → ...p/public/home-page/home-page.component.ts b/...ome-page/home-page/home-page.component.ts → ...p/public/home-page/home-page.component.ts