From 90e157a5ac76ffe4226ab281315e4c67b74cd1fb Mon Sep 17 00:00:00 2001 From: --list Date: Thu, 17 Jun 2021 08:39:03 +0200 Subject: [PATCH] removed conflict --- packages/medusa/src/services/order.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/medusa/src/services/order.js b/packages/medusa/src/services/order.js index b0d765324c..b946de5848 100644 --- a/packages/medusa/src/services/order.js +++ b/packages/medusa/src/services/order.js @@ -1136,11 +1136,7 @@ class OrderService extends BaseService { const result = await this.retrieve(orderId) -<<<<<<< HEAD - const evaluatedNoNotification = noNotification !== undefined && noNotification !== null ? noNotification : order.no_notification -======= const evaluatedNoNotification = noNotification !== undefined ? noNotification : order.no_notification ->>>>>>> 04fe5292f7e9dcd14cb1a4ea17db8978f9b52c03 this.eventBus_.emit(OrderService.Events.REFUND_CREATED, { id: result.id,