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

app/assets/stylesheets/framework/variables.scss

@@ -577,7 +577,6 @@ Animation Functions
 $dropdown-animation-timing: cubic-bezier(0.23, 1, 0.32, 1);
 
 /*
-<<<<<<< HEAD
 GitLab Plans
 */
 
@@ -592,10 +591,10 @@ Cross-project Pipelines
 
 $linked-project-column-margin: 60px;
 
-=======
+/*
 Convdev Index
 */
 $color-high-score: $green-400;
 $color-average-score: $orange-400;
 $color-low-score: $red-400;
->>>>>>> ce/master
+