Resolve pipelines/components/graph/stage_column_component.vue

286e5094 · Robert Speicher · 09df8126 · 286e5094
Commit 286e5094 authored May 17, 2018 by Robert Speicher
Show 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
@@ -29,14 +29,11 @@ export default {
      required: false,
      default: '',
    },
-<<<<<<< HEAD
    hasTriggeredBy: {
      type: Boolean,
      required: true,
    },
-=======
->>>>>>> upstream/master
  },
  methods: {