From a772d3fca90ce260de80caba6d282c9ed5187aee Mon Sep 17 00:00:00 2001
From: unknown <shioryuu0302@gmail.com>
Date: Mon, 30 Aug 2021 14:07:50 +0700
Subject: [PATCH] Remove conflict

---
 pages/index.tsx                                     | 9 ---------
 src/components/common/SelectCommon/SelectCommon.tsx | 6 +-----
 src/components/icons/index.ts                       | 3 ---
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/pages/index.tsx b/pages/index.tsx
index 6629096ac..1d3072ef7 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -5,14 +5,6 @@ import { HomeBanner, HomeCollection, HomeCTA, HomeSubscribe, HomeVideo, HomeCate
 export default function Home() {
   return (
     <>
-<<<<<<< HEAD
-      <div>This is home page</div>
-      <ViewAllItem link="/all"/>
-      <ItemWishList />
-      <Logo />
-      <SelectCommon option={OPTION_SORT}>Sort by</SelectCommon>
-      <SelectCommon option={OPTION_STATES} size={"large"} type={"custom"}>States</SelectCommon>
-=======
       <HomeBanner />
       <HomeFeature />
       <HomeCategories />
@@ -21,7 +13,6 @@ export default function Home() {
       <HomeCTA />
       <HomeRecipe />
       <HomeSubscribe />
->>>>>>> 08cd011b5ebb28ba4205d167dc07c81e3b9c3072
     </>
   )
 }
diff --git a/src/components/common/SelectCommon/SelectCommon.tsx b/src/components/common/SelectCommon/SelectCommon.tsx
index d8eb9e904..e0e8c390c 100644
--- a/src/components/common/SelectCommon/SelectCommon.tsx
+++ b/src/components/common/SelectCommon/SelectCommon.tsx
@@ -35,10 +35,6 @@ const SelectCommon = ({ type = 'default', size = 'base', option, children }: Pro
         setActive(!isActive)
     }
 
-    const changeSelectedName = (props:string) => {
-        setSelectedName(props)
-    }
-
     return(
         <>
             <div className={classNames({
@@ -68,7 +64,7 @@ const SelectCommon = ({ type = 'default', size = 'base', option, children }: Pro
                                 [s.selectOption] : true,
                                 [s[size]] : !!size,
                             })}
-                                onClick = { changeSelectedName!.(item.name) }
+                                onClick = { () => setSelectedName(item.name) }
                             >{item.name}</div>
                         )
                     }
diff --git a/src/components/icons/index.ts b/src/components/icons/index.ts
index 0c3dfde93..b272e9a83 100644
--- a/src/components/icons/index.ts
+++ b/src/components/icons/index.ts
@@ -9,13 +9,10 @@ export { default as IconHome } from './IconHome'
 export { default as IconShopping } from './IconShopping'
 export { default as IconHeart } from './IconHeart'
 export { default as IconVector } from './IconVector'
-<<<<<<< HEAD
 export { default as IconVectorDown } from './IconVectorDown'
-=======
 export { default as IconFacebookColor } from './IconFacebookColor'
 export { default as IconGoogleColor } from './IconGoogleColor'
 export { default as IconApple } from './IconApple'
 export { default as ArrowLeft } from './ArrowLeft'
 export { default as ArrowRight } from './ArrowRight'
 export { default as Close } from './Close'
->>>>>>> 08cd011b5ebb28ba4205d167dc07c81e3b9c3072