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

chore: Fix merge conflicts with master

Browse Source
This commit is contained in:
olivermrbl
2023-03-12 12:53:07 +01:00
parent b7a48e51df 601d20e7ab
commit 6d928628a9
29 changed files with 471 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yarn.lock
+1 -1
View File
@@ -5734,7 +5734,7 @@ __metadata:
typeorm: ^0.3.11
typescript: ^4.4.4
peerDependencies:
"@medusajs/medusa": 1.7.11
"@medusajs/medusa": 1.7.12
typeorm: ^0.3.11
languageName: unknown
linkType: soft