🔀 merge: Merge branch 'm1-tan' of https://github.com/KieIO/grocery-vercel-commerce into m1-tan

:%s
This commit is contained in:
lytrankieio123
2021-08-26 18:46:11 +07:00
9 changed files with 74 additions and 15 deletions

View File

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