fix: merge develop

This commit is contained in:
Sebastian Rindom
2021-04-13 12:16:40 +02:00
parent a468c451e8
commit 2982a8e682
19 changed files with 0 additions and 80 deletions
@@ -32,11 +32,7 @@
"medusa-interfaces": "1.x"
},
"dependencies": {
<<<<<<< HEAD
"medusa-core-utils": "^1.1.4",
=======
"medusa-core-utils": "^1.1.5",
>>>>>>> origin/develop
"medusa-test-utils": "^1.1.8",
"mongoose": "^5.8.0"
},