From 93f973022c586ef07b53f359d8ddb36cb5d08ae9 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Mon, 17 Feb 2020 12:00:08 +0300 Subject: [PATCH] fix conflict --- Mohem/src/app/hmg-common/services/common/common.service.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 45251d5d..c9822e46 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -494,11 +494,7 @@ public getMonthNameAr(value: number): string { text: acceptLabel, role: 'Confirm', -<<<<<<< HEAD cssClass: "checkOutOkBtn", -======= - cssClass: 'confirmBtn', ->>>>>>> 52085849999743b338c6bc8f5e40247bfa477057 handler: () => {