fix conflict

arabic-version
ashwaq 6 years ago
parent 838e7cf99b
commit 93f973022c

@ -494,11 +494,7 @@ public getMonthNameAr(value: number): string {
text: acceptLabel,
role: 'Confirm',
<<<<<<< HEAD
cssClass: "checkOutOkBtn",
=======
cssClass: 'confirmBtn',
>>>>>>> 52085849999743b338c6bc8f5e40247bfa477057
handler: () => {

Loading…
Cancel
Save