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-economic/package.json
+++ b/packages/medusa-plugin-economic/package.json
@@ -39,11 +39,7 @@
    "axios": "^0.19.2",
    "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",
    "moment": "^2.27.0"
  },