fixed conflits

This commit is contained in:
u-e 2019-07-23 19:54:24 +03:00
commit 305d17ddbc
2 changed files with 2 additions and 2 deletions

View File

@ -16,7 +16,7 @@ export default {
$primaryDarkGray: '#c1c5c7',
$primaryLightGray: '#f6f6f6',
$primaryRed: '#e63535',
$companyRed: '#e63535',
$companyRed: '#c10000',
$primaryBlack: '#c1c5c7',
$primaryDarkText: '#526d91',

View File

@ -16,7 +16,7 @@ export default {
$primaryDarkGray: '#788187',
$primaryLightGray: '#f6f6f6',
$primaryRed: '#e63535',
$companyRed: '#e63535',
$companyRed: '#c10000',
$primaryBlack: '#3c4449',
$primaryDarkText: '#788187',