-
+
View All
diff --git a/src/components/common/index.ts b/src/components/common/index.ts
index 8e796f820..2ff7a6557 100644
--- a/src/components/common/index.ts
+++ b/src/components/common/index.ts
@@ -19,3 +19,4 @@ export { default as Footer} from './Footer/Footer'
export { default as MenuDropdown} from './MenuDropdown/MenuDropdown'
export { default as NotiMessage} from './NotiMessage/NotiMessage'
export { default as VideoPlayer} from './VideoPlayer/VideoPlayer'
+export { default as SelectCommon} from './SelectCommon/SelectCommon'
diff --git a/src/components/icons/index.ts b/src/components/icons/index.ts
index eeaffb85b..038ab076d 100644
--- a/src/components/icons/index.ts
+++ b/src/components/icons/index.ts
@@ -1,4 +1,5 @@
export { default as IconBuy } from './IconBuy'
+<<<<<<< HEAD
export { default as ArrowUp } from './IconArrowUp'
export { default as IconSearch } from './IconSearch'
export { default as IconArrowRight } from './IconArrowRight'
@@ -8,3 +9,7 @@ export { default as IconInfo } from './IconInfo'
export { default as IconHome } from './IconHome'
export { default as IconShopping } from './IconShopping'
export { default as IconHeart } from './IconHeart'
+=======
+export { default as IconHeart } from './IconHeart'
+export { default as IconVector } from './IconVector'
+>>>>>>> 7d55bbf46e49a375575303f16ec393462c6c573d