Resolve conflicts in pipelines.scss

app/assets/stylesheets/pages/pipelines.scss

@@ -202,25 +202,6 @@
     }
   }
 
-  /**
-   * Play button with icon in dropdowns
-   */
-  .no-btn {
-    border: none;
-    background: none;
-    outline: none;
-    width: 100%;
-    text-align: left;
-
-    .icon-play {
-      position: relative;
-      top: 2px;
-      margin-right: 5px;
-      height: 13px;
-      width: 12px;
-    }
-  }
-
   .duration,
   .finished-at {
     color: $gl-text-color-secondary;
@@ -498,13 +479,11 @@
       @extend .build-content:hover;
     }
 
-    .ci-action-icon-container {
+    // Action Icons in big pipeline-graph nodes
+    .ci-action-icon-container.ci-action-icon-wrapper {
       position: absolute;
       right: 5px;
       top: 5px;
-
-      // Action Icons in big pipeline-graph nodes
-      &.ci-action-icon-wrapper {
       height: 30px;
       width: 30px;
       background: $white-light;
@@ -538,7 +517,6 @@
         }
       }
     }
-    }
 
     .ci-status-icon svg {
       height: 20px;
@@ -995,7 +973,6 @@ a.linked-pipeline-mini-item {
   }
 }
 
-<<<<<<< HEAD
 /**
  * Play button with icon in dropdowns
  */
@@ -1217,8 +1194,6 @@ a.linked-pipeline-mini-item {
   vertical-align: top;
 }
 
-=======
->>>>>>> ce-com/master
 .ci-header-container {
   min-height: 55px;