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

Remove conflict

Browse Source
This commit is contained in:
unknown
2021-08-30 14:07:50 +07:00
parent ca41dcd194
commit a772d3fca9
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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