diff --git a/Mohem/src/app/my-team/my-team.module.ts b/Mohem/src/app/my-team/my-team.module.ts index a569754b..49925b71 100644 --- a/Mohem/src/app/my-team/my-team.module.ts +++ b/Mohem/src/app/my-team/my-team.module.ts @@ -9,11 +9,7 @@ import { IonicModule } from '@ionic/angular'; import { MyTeamPage } from './my-team.page'; import { HmgCommonModule } from '../hmg-common/hmg-common.module'; import { from } from 'rxjs'; -<<<<<<< HEAD import { WorklistService } from '../notification/service/worklist.service'; -======= -import { WorklistService } from 'src/app/notification/service/worklist.service'; ->>>>>>> e0a02c254f3a86fa5c1f466668fe4a4a90433c95 const routes: Routes = [