solve conflit

src/app/pages/agenda/agenda.page.ts

@@ -7,15 +7,9 @@ import { EventsService } from 'src/app/services/events.service';
 import { Event } from '../../models/event.model';
 import { Router, NavigationEnd } from '@angular/router';
 import { AlertService } from 'src/app/services/alert.service';
-<<<<<<< HEAD
-import { NewEventPage } from './new-event/new-event.page';
-import { ViewEventPage } from './view-event/view-event.page';
 import { momentG }  from 'src/plugin/momentG';
 import { DomSanitizer } from "@angular/platform-browser";
 
-=======
-import { momentG }  from 'src/plugin/momentG'
->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 // showTimeline
 import { setHours, setMinutes } from 'date-fns';
 import {
@@ -24,13 +18,8 @@ import {
   CalendarView,
   DAYS_OF_WEEK,
 } from 'angular-calendar';
-<<<<<<< HEAD
 import { CustomDateFormatter } from './custom-date-formatter.provider';
-=======
-
->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 import { EventListPage } from '../gabinete-digital/event-list/event-list.page';
-import { CustomDateFormatter } from './custom-date-formatter.provider';
 import { ViewEventPage } from './view-event/view-event.page';
 import { NewEventPage } from './new-event/new-event.page';
 
@@ -112,7 +101,6 @@ export class AgendaPage implements OnInit {
   startTime: Date;
   endTime: Date;
 
-<<<<<<< HEAD
 
   mobileComponent: any = {
     showAddNewEvent: false,
@@ -129,8 +117,6 @@ export class AgendaPage implements OnInit {
     saveData: {}
   }
 
-=======
->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
   constructor( 
     private alertCtrl: AlertController,
     @Inject(LOCALE_ID) private locale: string,
@@ -241,17 +227,10 @@ export class AgendaPage implements OnInit {
     this.onCurrentChanged(newDate); */
   }
 
-<<<<<<< HEAD
   onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
     console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
     this.eventSelectedDate2 = ev.selectedTime;
   }; 
-=======
-  /* onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
-        console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
-        this.eventSelectedDate2 = ev.selectedTime;
-    }; */
->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 
   onRangeChanged (ev: { startTime: Date, endTime: Date }) {
     this.rangeStartDate = ev.startTime;

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -11,7 +11,7 @@ import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-
 @Component({
   selector: 'app-approve-event-modal',
   templateUrl: './approve-event-modal.page.html',
-  styleUrls: ['./approve-event-modal.page.scss'],
+  /* styleUrls: ['./approve-event-modal.page.scss'], */
 })
 export class ApproveEventModalPage implements OnInit {
   event: Event;