fix merge conflicts

2021-06-09 10:29:19 +02:00
parent 3e00f5c120
commit 09a51ea3fd
1 changed files with 1 additions and 1 deletions
--- 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"
 }