Fix conflicts for commit/pipelines/pipelines_table.vue

b87ac1b0 · Filipa Lacerda · 5169e967 · b87ac1b0
Commit b87ac1b0 authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/commit/pipelines/pipelines_table.vue app/assets/javascripts/commit/pipelines/pipelines_table.vue +0 -4

No files found.
--- a/app/assets/javascripts/commit/pipelines/pipelines_table.vue
+++ b/app/assets/javascripts/commit/pipelines/pipelines_table.vue
@@ -7,10 +7,6 @@
    mixins: [
      pipelinesMixin,
    ],
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master
    props: {
      endpoint: {
        type: String,