Resolve groups.scss conflicts

a856eeaa · LUKE BENNETT · 47179026 · a856eeaa
Commit a856eeaa authored Dec 12, 2017 by LUKE BENNETT
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/stylesheets/pages/groups.scss app/assets/stylesheets/pages/groups.scss +0 -3

No files found.
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -273,7 +273,6 @@ table.pipeline-project-metrics tr td {
  border-radius: $label-border-radius;
  font-weight: $gl-font-weight-normal;
 }
-<<<<<<< HEAD

 .plan-badge {
  margin-right: 15px;
@@ -309,5 +308,3 @@ table.pipeline-project-metrics tr td {
    svg g { fill: $gl-no-plan; }
  }
 }
-=======
->>>>>>> upstream/master