chore: Fix merge conflicts with master

2023-03-12 12:53:07 +01:00
parent b7a48e51df 601d20e7ab
commit 6d928628a9
29 changed files with 471 additions and 56 deletions
@@ -1,5 +1,12 @@
 # @medusajs/inventory

+## 1.0.9
+
+### Patch Changes
+
+- Updated dependencies [[`ce577f269`](https://github.com/medusajs/medusa/commit/ce577f2696aa2181bef8f3096b1a639feabe2714), [`aa0d1f321`](https://github.com/medusajs/medusa/commit/aa0d1f32153f82c6219efe5cfc08862db5e5a129), [`9f508c8bd`](https://github.com/medusajs/medusa/commit/9f508c8bd8bee63677504cc8b86f1643579945d8)]:
+  - @medusajs/medusa@1.7.12
+
 ## 1.0.8

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@medusajs/inventory",
-  "version": "1.0.8",
+  "version": "1.0.9",
  "description": "Inventory Module for Medusa",
  "main": "dist/index.js",
  "repository": {
@@ -35,7 +35,7 @@
    "test:unit": "jest --passWithNoTests"
  },
  "peerDependencies": {
-    "@medusajs/medusa": "1.7.11",
+    "@medusajs/medusa": "1.7.12",
    "typeorm": "^0.3.11"
  }
 }