fixed merge conflicts

2021-06-17 08:37:54 +02:00
parent 24a8b242b2 04fe5292f7
commit 99c95c8bfb
14 changed files with 15371 additions and 2 deletions
@@ -149,7 +149,11 @@ 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