summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/highlight/conflict_colors.scss
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/highlight/conflict_colors.scss')
-rw-r--r--app/assets/stylesheets/highlight/conflict_colors.scss2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/assets/stylesheets/highlight/conflict_colors.scss b/app/assets/stylesheets/highlight/conflict_colors.scss
index 98ca3775b72..910dc6f4ad6 100644
--- a/app/assets/stylesheets/highlight/conflict_colors.scss
+++ b/app/assets/stylesheets/highlight/conflict_colors.scss
@@ -1,5 +1,4 @@
// Disabled to use the color map for creating color schemes
-// scss-lint:disable ColorVariable
$conflict-colors: (
white-header-head-neutral : #e1fad7,
white-line-head-neutral : #effdec,
@@ -116,4 +115,3 @@ $conflict-colors: (
none_line_not_chosen : $gray-light
);
-// scss-lint:enable ColorVariable