asyavee/medusa-store
1
0 Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

removed conflict

Browse Source
This commit is contained in:
--list committed 2021-06-17 08:39:03 +02:00
1 parent 99c95c8bfb
commit 90e157a5ac
1 file changed
-4
Download Patch File Download Diff File Expand all files Collapse all files
packages/medusa/src/services/order.js
-4
View File
@@ -1136,11 +1136,7 @@ class OrderService extends BaseService {
const result = await this.retrieve(orderId) 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 const evaluatedNoNotification = noNotification !== undefined ? noNotification : order.no_notification
>>>>>>> 04fe5292f7e9dcd14cb1a4ea17db8978f9b52c03
this.eventBus_.emit(OrderService.Events.REFUND_CREATED, { this.eventBus_.emit(OrderService.Events.REFUND_CREATED, {
id: result.id, id: result.id,