chore: Fix merge conflicts with master

This commit is contained in:
olivermrbl committed 2023-03-03 12:01:35 +01:00
commit ad99a8bd24
66 files changed
+1556 -1465

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@medusajs/medusa",
"version": "1.7.10",
"version": "1.7.11",
"description": "E-commerce for JAMstack",
"main": "dist/index.js",
"bin": "./cli.js",