crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-07-11 23:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔀 merge: fix conflict import in index (icons)

Browse Source 
:%s
This commit is contained in:
lytrankieio123 2021-08-26 18:59:12 +07:00
parent 2dea68a668
commit 499221a7b8
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/icons/index.ts
View File

@ -1,5 +1,4 @@
export { default as IconBuy } from './IconBuy' export { default as IconBuy } from './IconBuy'
<<<<<<< HEAD
export { default as ArrowUp } from './IconArrowUp' export { default as ArrowUp } from './IconArrowUp'
export { default as IconSearch } from './IconSearch' export { default as IconSearch } from './IconSearch'
export { default as IconArrowRight } from './IconArrowRight' 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 IconHome } from './IconHome'
export { default as IconShopping } from './IconShopping' export { default as IconShopping } from './IconShopping'
export { default as IconHeart } from './IconHeart' export { default as IconHeart } from './IconHeart'
=======
export { default as IconHeart } from './IconHeart'
export { default as IconVector } from './IconVector' export { default as IconVector } from './IconVector'
>>>>>>> 7d55bbf46e49a375575303f16ec393462c6c573d