fixed merge

georgievtodor · georgievtodor · commit 0cdd4a7b458a · 2017-01-02T20:48:42.000+02:00
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -40,11 +40,8 @@ import { CreateCategoryComponent } from './create-category/create-category.compo
     ProfileOutboxComponent,
     AllPostsByUserComponent,
     BiggerFontDirective,
-<<<<<<< HEAD
-    FooterComponent
-=======
+    FooterComponent,
     CreateCategoryComponent
->>>>>>> beed9c51347c179d07fbe5a1034c1a2b3510cb3e
   ],
   imports: [
     BrowserModule,
