fix: Merge conflicts with master

This commit is contained in:
olivermrbl committed 2023-03-01 18:58:59 +01:00
commit f5ed47053c
7 files changed
+19 -14

No files matched your search

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