From 09a51ea3fd599a719294c315c56927d6ef355af7 Mon Sep 17 00:00:00 2001
From: olivermrbl <oliver@mrbltech.com>
Date: Wed, 9 Jun 2021 10:29:19 +0200
Subject: [PATCH] fix merge conflicts

---
 packages/medusa/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/medusa/package.json b/packages/medusa/package.json
index 3a25322175..fb3eb1f7f6 100644
--- a/packages/medusa/package.json
+++ b/packages/medusa/package.json
@@ -78,5 +78,5 @@
     "uuid": "^8.3.1",
     "winston": "^3.2.1"
   },
-  "gitHead": "245ccdc4774965cdd27d4dbdb5fbb084c8066c66"
+  "gitHead": "982da259ed93fe1b618800c8693a5c9dfe312532"
 }
\ No newline at end of file