From 2d5efa23aaf3fa37f44acd1d79c96e81dc1892f2 Mon Sep 17 00:00:00 2001 From: maheedhar1998 Date: Sun, 1 Mar 2020 19:38:48 -0500 Subject: [PATCH] upp --- src/app/user-contact/user-contact.module.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/app/user-contact/user-contact.module.ts b/src/app/user-contact/user-contact.module.ts index 56b873b1..0981e816 100644 --- 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 {}