From 0699b0dfd71ed597aa43a3c656fd7c2cf24a4f9e Mon Sep 17 00:00:00 2001
From: unknown <shioryuu0302@gmail.com>
Date: Wed, 8 Sep 2021 21:24:48 +0700
Subject: [PATCH] merge: fix conflict

---
 .../common/BreadcrumbCommon/BreadcrumbCommon.module.scss      | 3 ---
 src/components/common/Layout/Layout.tsx                       | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/src/components/common/BreadcrumbCommon/BreadcrumbCommon.module.scss b/src/components/common/BreadcrumbCommon/BreadcrumbCommon.module.scss
index 95c8526e1..8f6c05bf7 100644
--- a/src/components/common/BreadcrumbCommon/BreadcrumbCommon.module.scss
+++ b/src/components/common/BreadcrumbCommon/BreadcrumbCommon.module.scss
@@ -2,10 +2,7 @@
 
 .breadcrumbCommon {
     color: var(--text-base);
-<<<<<<< HEAD
-=======
     .currentItem {
         cursor: default;
     }
->>>>>>> a9f9f06eb9dee2a1ddefe907ff804237a78c5210
 }
diff --git a/src/components/common/Layout/Layout.tsx b/src/components/common/Layout/Layout.tsx
index 17f520185..adf7c3d7b 100644
--- a/src/components/common/Layout/Layout.tsx
+++ b/src/components/common/Layout/Layout.tsx
@@ -2,7 +2,6 @@ import { CommerceProvider } from '@framework'
 import { useRouter } from 'next/router'
 import { FC } from 'react'
 import { useModalCommon } from 'src/components/hooks'
-import { CartDrawer } from '..'
 import Footer from '../Footer/Footer'
 import Header from '../Header/Header'
 import s from './Layout.module.scss'
@@ -30,9 +29,6 @@ const Layout: FC<Props> = ({ children }) => {
                 <Header />
                 <main >{children}</main>
                 <button onClick={toggle}>toggle card: {visibleCartDrawer.toString()}</button>
-                <CartDrawer
-                    visible={visibleCartDrawer}
-                    onClose={closeCartDrawer} />
                 <Footer />
             </div>
         </CommerceProvider>