🔀 merge:Merge branch 'common' of github.com:KieIO/grocery-vercel-commerce into m2-datnguyen

:%s
This commit is contained in:
unknown
2021-08-26 19:53:25 +07:00
parent 7cede5cc8c
commit 9073231b2e
4 changed files with 2 additions and 20 deletions

View File

@@ -1,8 +1,5 @@
export { default as HomeBanner } from './HomeBanner/HomeBanner'
<<<<<<< HEAD
export { default as CollectionCarcoucel } from './CollectionCarcoucel/CollectionCarcoucel'
=======
export { default as HomeCTA } from './HomeCTA/HomeCTA'
export { default as HomeSubscribe } from './HomeSubscribe/HomeSubscribe'
export { default as HomeVideo } from './HomeVideo/HomeVideo'
>>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d