fix: merge develop

2021-04-13 12:16:40 +02:00
parent a468c451e8
commit 2982a8e682
19 changed files with 0 additions and 80 deletions
--- a/packages/medusa-plugin-wishlist/package.json
+++ b/packages/medusa-plugin-wishlist/package.json
@@ -37,11 +37,7 @@
  "dependencies": {
    "body-parser": "^1.19.0",
    "express": "^4.17.1",
-<<<<<<< HEAD
-    "medusa-core-utils": "^1.1.4",
-=======
    "medusa-core-utils": "^1.1.5",
->>>>>>> origin/develop
    "medusa-test-utils": "^1.1.8"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"