asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Fix merge conflicts with master

Browse Source
This commit is contained in:
olivermrbl
2023-03-03 12:01:35 +01:00
parent 40de54b010 2507af68b5
commit ad99a8bd24
66 changed files with 1556 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yarn.lock
+1 -1
View File
@@ -5832,7 +5832,7 @@ __metadata:
typeorm: ^0.3.11
typescript: ^4.4.4
peerDependencies:
"@medusajs/medusa": 1.7.10
"@medusajs/medusa": 1.7.11
typeorm: ^0.3.11
languageName: unknown
linkType: soft