solve conflit

This commit is contained in:
tiago.kayaya
2021-02-26 16:34:04 +01:00
parent 25ffc18a45
commit 80ffcbd5be
5 changed files with 36 additions and 257 deletions
@@ -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;