fix: Merge conflicts

2022-07-12 09:29:41 +02:00
parent b402b9f159 6a2fd3b361
commit fb0346f1fa
418 changed files with 74357 additions and 14856 deletions
@@ -37,5 +37,6 @@
    "prettier": "^2.2.1",
    "typescript": "^4.1.3"
  },
-  "gitHead": "cd1f5afa5aa8c0b15ea957008ee19f1d695cbd2e"
+  "gitHead": "cd1f5afa5aa8c0b15ea957008ee19f1d695cbd2e",
+  "homepage": "https://docs.medusajs.com/js-client/overview"
 }