Resolve conflict in stage_column_component.vue

53bb8fc6 · Winnie Hellmann · b7ec08d0 · 53bb8fc6
Commit 53bb8fc6 authored Oct 18, 2018 by Winnie Hellmann
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
@@ -31,15 +31,12 @@ export default {
      default: '',
    },

-<<<<<<< HEAD
    hasTriggeredBy: {
      type: Boolean,
      required: true,
    },
  },

-=======
->>>>>>> upstream/master
  methods: {
    groupId(group) {
      return `ci-badge-${_.escape(group.name)}`;