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

properly removed all merge conflicts

Browse Source
This commit is contained in:
--list
2021-06-17 08:51:57 +02:00
parent 90e157a5ac
commit 0f2fe26b0e
7 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/medusa/src/api/routes/admin/orders/request-return.js
-4
View File
@@ -149,11 +149,7 @@ export default async (req, res) => {
.withTransaction(manager)
.retrieve(id)
<<<<<<< HEAD
const evaluatedNoNotification = value.no_notification !== undefined && value.no_notification !== null ? value.no_notification : order.no_notification
=======
const evaluatedNoNotification = value.no_notification !== undefined ? value.no_notification : order.no_notification
>>>>>>> 04fe5292f7e9dcd14cb1a4ea17db8978f9b52c03
returnObj.no_notification = evaluatedNoNotification
const createdReturn = await returnService