fix: Merge conflicts with master

2023-03-01 18:58:59 +01:00
parent 947687d3f7 6e3b339b22
commit f5ed47053c
7 changed files with 19 additions and 14 deletions
@@ -5226,7 +5226,7 @@ __metadata:
    typeorm: ^0.3.11
    typescript: ^4.4.4
  peerDependencies:
-    "@medusajs/medusa": 1.7.9
+    "@medusajs/medusa": 1.7.10
    typeorm: ^0.3.11
  languageName: unknown
  linkType: soft