Fix conflicts in framework/selects.scss

1c108b8d · Annabel Dunstone Gray · 7eb95816 · 1c108b8d
Commit 1c108b8d authored Sep 11, 2018 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/stylesheets/framework/selects.scss app/assets/stylesheets/framework/selects.scss +0 -3

No files found.
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -238,7 +238,6 @@
  .group-path {
    color: $gl-gray-400;
-<<<<<<< HEAD
  }
 }
@@ -249,8 +248,6 @@
  .project-path {
    color: $gl-gray-400;
-=======
->>>>>>> upstream/master
  }
 }