From 499221a7b8217276dbba438808a6ad3ece216a4d Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Thu, 26 Aug 2021 18:59:12 +0700 Subject: [PATCH] :twisted_rightwards_arrows: merge: fix conflict import in index (icons) :%s --- src/components/icons/index.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/icons/index.ts b/src/components/icons/index.ts index 038ab076d..ae39054a8 100644 --- a/src/components/icons/index.ts +++ b/src/components/icons/index.ts @@ -1,5 +1,4 @@ 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' @@ -9,7 +8,4 @@ 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