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

fix: Merge conflicts with master

Browse Source
This commit is contained in:
olivermrbl committed 2023-01-18 10:17:39 +01:00
2 parents 76d1752310 107cd4de4c
commit ab580066ae
135 files changed
+7501 -1981
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/medusa-react/src/contexts/medusa.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import Medusa from "@medusajs/medusa-js"
import {
QueryClientProvider,
QueryClientProviderProps,
QueryClientProviderProps
} from "@tanstack/react-query"
import React from "react"