merge:resolve conflicts

1 files changed, 4 insertions, 2 deletions

diff --git a/storefront/pages/_app.js b/storefront/pages/_app.js
index 3737ae7..1513a72 100644
--- a/storefront/pages/_app.js
+++ b/storefront/pages/_app.js
@@ -1,6 +1,6 @@
 import { MedusaProvider } from "medusa-react"

 import { QueryClient } from "@tanstack/react-query"

-import { medusaClient } from "../lib/medusa-client"

+import Layout from "../components/Layout"

 

 const queryClient = new QueryClient()

 

@@ -12,7 +12,9 @@ export default function App({ Component, pageProps }) {
         process.env.NEXT_PUBLIC_MEDUSA_BACKEND_URL || "http://localhost:9000"

       }

     >

-      <Component {...pageProps} />

+      <Layout>

+        <Component {...pageProps} />

+      </Layout>

     </MedusaProvider>

   )

 }