Fix merge

This commit is contained in:
Peter Maquiran
2021-05-25 13:42:47 +01:00
parent 04368d8a11
commit 1df075b73b
@@ -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) {