Resolve app/assets/stylesheets/pages/pipelines.scss

af210445 · Lin Jen-Shin · ff01b6eb · af210445
Commit af210445 authored Jul 26, 2017 by Lin Jen-Shin
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
@@ -626,12 +626,8 @@
 }

 // Dropdown button in mini pipeline graph
-<<<<<<< HEAD
 button.mini-pipeline-graph-dropdown-toggle,
 a.linked-pipeline-mini-item {
-=======
-button.mini-pipeline-graph-dropdown-toggle {
->>>>>>> upstream/master
  border-radius: 100px;
  background-color: $white-light;
  border-width: 1px;