upp

SCCapstone · Mar 2, 2020 · 2d5efa2 · 2d5efa2
1 parent b6bc123
commit 2d5efa2
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/app/user-contact/user-contact.module.ts b/src/app/user-contact/user-contact.module.ts
@@ -6,11 +6,7 @@ import { Routes, RouterModule } from '@angular/router';
 import { IonicModule } from '@ionic/angular';
 
 import { UserContactPage } from './user-contact.page';
-<<<<<<< HEAD
-import { ContactsPage } from '../contacts/contacts2.module';
-=======
 // import { Contacts2PageModule } from '../contacts/contacts2.module';
->>>>>>> development
 
 const routes: Routes = [
   {
@@ -27,16 +23,10 @@ const routes: Routes = [
     RouterModule.forChild(routes)
   ],
   declarations: [
-<<<<<<< HEAD
-    UserContactPage
-  ],
-  entryComponents: [ContactsPage]
-=======
     UserContactPage,
     // Contacts2PageModule
   ],
   entryComponents: [//Contacts2PageModule
   ]
->>>>>>> development
 })
 export class UserContactPageModule {}