fix merge conflicts
This commit is contained in:
commit
0a1ef4e048
1 changed files with 1 additions and 0 deletions
|
@ -9,6 +9,7 @@ $light-primary-text-color: #333;
|
|||
$light-secondary-text-color: #6b6b6b;
|
||||
$light-inactive-text-color: #b5b5b5;
|
||||
$light-background-color: #fdfdfd;
|
||||
$light-sidebar-background: $white;
|
||||
|
||||
$light-button-background-color: #f4f4f4;
|
||||
$light-button-color: $black;
|
||||
|
|
Loading…
Reference in a new issue