Resolve pipelines_table_row

327574c9 · Luke Bennett · c9a29d3e · 327574c9
Commit 327574c9 authored Jan 11, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/pipelines/components/pipelines_table_row.vue .../javascripts/pipelines/components/pipelines_table_row.vue +0 -4

No files found.
--- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
@@ -223,12 +223,8 @@
    <div class="table-section section-10 commit-link">
      <div
        class="table-mobile-header"
-<<<<<<< HEAD
        role="rowheader"
      >
-=======
-        role="rowheader">
->>>>>>> upstream/master
        Status
      </div>
      <div class="table-mobile-content">