crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-04-24 03:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Julián Benegas 2020-10-22 19:25:30 -03:00
parent a64c805b45
commit 5c3fb33bcf
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/components.css
View File

@ -1,3 +1,3 @@
.fit {
min-height: calc(100vh - 88px - 41px);
min-height: calc(100vh - 88px);
}

8
pages/_app.tsx
View File

@ -1,11 +1,5 @@
<<<<<<< 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
import 'keen-slider/keen-slider.min.css'
// To be removed
import 'animate.css'