solve conflit

src/app/home/home.page.ts

@@ -7,20 +7,12 @@ import { PublicationDetailPage } from '../../app/pages/publications/view-publica
 import { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';
 import { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'
 import { ViewEventPage } from '../../app/pages/agenda/view-event/view-event.page'
-import { ApproveEventModalPage } from '../../app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page';
+/* import { ApproveEventModalPage } from '../../app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page'; */
 
-<<<<<<< HEAD
-import { Plugins, PushNotificationActionPerformed } from '@capacitor/core';
-=======
 /* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core'; */
->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 import { Router } from '@angular/router';
 
-<<<<<<< HEAD
-const { PushNotifications, LocalNotificationAction } = Plugins;
-=======
 /* const { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins; */
->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 
 @Component({
   selector: 'app-home',
@@ -36,13 +28,7 @@ export class HomePage implements OnInit {
   totalExpediente = 0;
   profile: string;
 
-<<<<<<< HEAD
-  windowsWidth =  window.innerWidth;
-
-  constructor(private ngZone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }
-=======
   constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }
->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 
   ngOnInit() {
 /*     //Initialize profile as mdgpr
@@ -122,34 +108,10 @@ export class HomePage implements OnInit {
     ); */
   }
 
-<<<<<<< HEAD
-
-
-
-  async localNotificationPresent(notification) {
-
-    LocalNotificationAction.
-
-    LocalNotifications.schedule({
-      notifications: [
-        {
-          title: notification.title,
-          body: notification.body,
-          id: 1,
-          schedule: { at: new Date(Date.now() + 1000) },
-          sound: null,
-          attachments: null,
-          actionTypeId: "",
-          extra: null,
-          foreground: true,
-        }
-      ]
-=======
   /* mobileFirstTest() {
     this.zone.run(() => {
       alert("Hello MobileFirst");
       alert("Connecting to Server...");
->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
     });
     WLAuthorizationManager.obtainAccessToken("").then(
       (token) => {
@@ -182,7 +144,7 @@ export class HomePage implements OnInit {
     );
   } */
 
-   async openApproveModal(eventSerialNumber){
+  /*  async openApproveModal(eventSerialNumber){
     const modal = await this.modalController.create({
       component: ApproveEventModalPage,
       componentProps:{
@@ -194,9 +156,9 @@ export class HomePage implements OnInit {
 
     await modal.present();
     modal.onDidDismiss();
-  } 
+  }  */
 
-  async viewEventDetail(eventId:any) {
+ /*  async viewEventDetail(eventId:any) {
     console.log(this.profile);
     
     const modal = await this.modalController.create({
@@ -209,7 +171,7 @@ export class HomePage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss();
-  }
+  } */
 
   /* async viewExpedientDetail(serialNumber:any) {
     console.log(this.profile);
@@ -250,7 +212,7 @@ export class HomePage implements OnInit {
 
 
 
-  async viewPublicationDetail(folderId) {
+ /*  async viewPublicationDetail(folderId) {
     const modal = await this.modalController.create({
       component: PublicationDetailPage,
       componentProps: {
@@ -261,13 +223,13 @@ export class HomePage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss();
-  }
+  } */
 
-  async viewPublications(folderId) {
+ /*  async viewPublications(folderId) {
     const modal = await this.modalController.create({
       component: ViewPublicationsPage,
-      /* enterAnimation,
-      leaveAnimation, */
+      enterAnimation,
+      leaveAnimation,
       componentProps: {
         item: folderId,
       },
@@ -277,7 +239,7 @@ export class HomePage implements OnInit {
     await modal.present();
     modal.onDidDismiss();
   }
-
+ */