removed conflict

2021-06-17 08:39:03 +02:00
parent 99c95c8bfb
commit 90e157a5ac
1 changed files with 0 additions and 4 deletions
--- 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,