From 1df075b73b1d8d479a85853957ec2df24eb39fac Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 25 May 2021 13:42:47 +0100
Subject: [PATCH] Fix merge

---
 .../approve-event-modal/approve-event-modal.page.ts         | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
index 365d9db88..788510ab1 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
@@ -129,12 +129,8 @@ export class ApproveEventModalPage implements OnInit {
 
   async getAttachments() {
     this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
-<<<<<<< HEAD
-=======
-    console.log(this.loadedAttachments);
-    
 
->>>>>>> a7aa68d83c781483344d8d19665dad6265f9d44c
+    console.log(this.loadedAttachments);
   }
 
   async openOptions(ev:any) {