Fix conflicts in variables.scss and environments.scss

app/assets/stylesheets/framework/variables.scss

@@ -671,10 +671,8 @@ Animation Functions
 $dropdown-animation-timing: cubic-bezier(0.23, 1, 0.32, 1);
 
 /*
-<<<<<<< HEAD
 GitLab Plans
 */
-
 $gl-gold-plan: #d4af37;
 $gl-silver-plan: #91a1ab;
 $gl-bronze-plan: #cd7f32;
@@ -682,12 +680,9 @@ $gl-bronze-plan: #cd7f32;
 /*
 Cross-project Pipelines
  */
-
 $linked-project-column-margin: 60px;
 
 /*
-=======
->>>>>>> upstream/master
 Performance Bar
 */
 $perf-bar-text: #999;

app/assets/stylesheets/pages/environments.scss

@@ -662,7 +662,6 @@
 
 .prometheus-table-row-highlight {
   background-color: $theme-gray-100;
-<<<<<<< HEAD
 }
 
 // EE-only
@@ -740,6 +739,4 @@
   .action-group .btn + .btn {
     margin-left: $gl-padding-8;
   }
-=======
->>>>>>> upstream/master
 }