Fix conflict for app/assets/javascripts/pipelines/components/graph/stage_column_component.vue

578689de · Filipa Lacerda · f45545ed · 578689de
Commit 578689de authored Apr 23, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/pipelines/components/graph/stage_column_component.vue ...pts/pipelines/components/graph/stage_column_component.vue +0 -3

No files found.
--- a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
@@ -34,13 +34,10 @@ export default {
      type: String,
      required: false,
      default: '',
-<<<<<<< HEAD
    },
    hasTriggeredBy: {
      type: Boolean,
      required: true,
-=======
->>>>>>> upstream/master
    },
  },