mirror of
https://github.com/ecency/ecency-mobile.git
synced 2024-12-19 11:21:41 +03:00
fixed conflits
This commit is contained in:
commit
305d17ddbc
@ -16,7 +16,7 @@ export default {
|
|||||||
$primaryDarkGray: '#c1c5c7',
|
$primaryDarkGray: '#c1c5c7',
|
||||||
$primaryLightGray: '#f6f6f6',
|
$primaryLightGray: '#f6f6f6',
|
||||||
$primaryRed: '#e63535',
|
$primaryRed: '#e63535',
|
||||||
$companyRed: '#e63535',
|
$companyRed: '#c10000',
|
||||||
$primaryBlack: '#c1c5c7',
|
$primaryBlack: '#c1c5c7',
|
||||||
$primaryDarkText: '#526d91',
|
$primaryDarkText: '#526d91',
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ export default {
|
|||||||
$primaryDarkGray: '#788187',
|
$primaryDarkGray: '#788187',
|
||||||
$primaryLightGray: '#f6f6f6',
|
$primaryLightGray: '#f6f6f6',
|
||||||
$primaryRed: '#e63535',
|
$primaryRed: '#e63535',
|
||||||
$companyRed: '#e63535',
|
$companyRed: '#c10000',
|
||||||
$primaryBlack: '#3c4449',
|
$primaryBlack: '#3c4449',
|
||||||
$primaryDarkText: '#788187',
|
$primaryDarkText: '#788187',
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user