Fix conflicts in pipelines.scss

app/assets/stylesheets/pages/pipelines.scss

@@ -126,47 +126,7 @@
   }
 }
 
-<<<<<<< HEAD
-.table.ci-table {
-
-  &.builds-page tbody tr {
-    height: 71px;
-  }
-
-  tr {
-    th {
-      padding: 16px 8px;
-      border: none;
-    }
-
-    td {
-      padding: 10px 8px;
-    }
-
-    td.environments-actions {
-      padding-right: 0;
-    }
-
-    td.stage-cell {
-      padding: 10px 0;
-    }
-
-    td.deploy-board-container {
-      padding: 0;
-    }
-
-    .commit-link {
-      padding: 9px 8px 10px 2px;
-    }
-  }
-
-  tbody {
-    border-top-width: 1px;
-  }
-
-=======
 .ci-table {
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
   .build.retried {
     background-color: $gray-lightest;
   }
@@ -1182,4 +1142,3 @@
     }
   }
 }
-