Fix conflict in app/assets/stylesheets/pages/builds.scss

c52f9ec1 · Clement Ho · 64c946ea · c52f9ec1
Commit c52f9ec1 authored May 25, 2018 by Clement Ho
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

app/assets/stylesheets/pages/builds.scss app/assets/stylesheets/pages/builds.scss +0 -7

No files found.
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -277,13 +277,6 @@
    &.coverage {
      padding: 0 16px 11px;
    }
-<<<<<<< HEAD
-
-    .btn-group.d-flex {
-      margin-top: 5px;
-    }
-=======
->>>>>>> gitlab-ce/master
  }

  .block-last {