Fix one more scss conflict

656f0413 · Nick Thomas · ad7146f8 · 656f0413
Commit 656f0413 authored Jun 16, 2017 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/stylesheets/pages/pipelines.scss app/assets/stylesheets/pages/pipelines.scss +0 -4

No files found.
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -1021,7 +1021,6 @@
  }
 }

-<<<<<<< HEAD
 .linked-pipeline-mini-list {
  display: inline-block;

@@ -1221,10 +1220,7 @@
  vertical-align: top;
 }

-.pipeline-header-container {
-=======
 .ci-header-container {
->>>>>>> ce/master
  min-height: 55px;

  .text-center {