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

Merge branch 'master' into jb/product-improvements

Browse Source
This commit is contained in:
Julián Benegas
2020-10-22 19:17:51 -03:00
parent 644034ae62 79d0c0a0cb
commit a64c805b45
54 changed files with 576 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/_app.tsx
View File

@@ -1,7 +1,11 @@
<<<<<<< HEAD
import '@assets/global.css'
import '@assets/tailwind.css'
import '@assets/utils.css'
import 'keen-slider/keen-slider.min.css'
=======
import '@assets/main.css'
>>>>>>> master
// To be removed
import 'animate.css'