Skip to content

G
gitlab-ce
Commit 1bfe73f6 authored by Nick Thomas's avatar Nick Thomas
Browse files
Options

Resolve some missed conflicts in app/assets/stylesheets/framework/variables.scss

parent 19e40ff2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
app/assets/stylesheets/framework/variables.scss
View file @ 1bfe73f6
...@@ -577,7 +577,6 @@ Animation Functions ...@@ -577,7 +577,6 @@ Animation Functions
$dropdown-animation-timing: cubic-bezier(0.23, 1, 0.32, 1); $dropdown-animation-timing: cubic-bezier(0.23, 1, 0.32, 1);
/* /*
<<<<<<< HEAD
GitLab Plans GitLab Plans
*/ */
...@@ -592,10 +591,10 @@ Cross-project Pipelines ...@@ -592,10 +591,10 @@ Cross-project Pipelines
$linked-project-column-margin: 60px; $linked-project-column-margin: 60px;
======= /*
Convdev Index Convdev Index
*/ */
$color-high-score: $green-400; $color-high-score: $green-400;
$color-average-score: $orange-400; $color-average-score: $orange-400;
$color-low-score: $red-400; $color-low-score: $red-400;
>>>>>>> ce/master
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7