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:Merge branch 'common' of github.com:KieIO/grocery-vercel-commerce into m2-datnguyen

Browse Source 
:%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
Download Patch File Download Diff File Expand all files Collapse all files

3
tailwind.config.js
View File

@@ -45,7 +45,6 @@ module.exports = {
'negative-border-line': 'var(--negative-border-line)',
'negative-light': 'var(--negative-light)',
<<<<<<< HEAD
'line': 'var(--border-line)',
'background': 'var(--background)',
'white': 'var(--white)',
@@ -54,8 +53,6 @@ module.exports = {
'disabled': 'var(--text-disabled)',
=======
>>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
line: 'var(--border-line)',
background: 'var(--background)',
white: 'var(--white)',