Resolve conflicts in app/assets/javascripts/pipelines/components/graph/stage_column_component.vue

e46dc315 · Stan Hu · 75c1d2b4 · e46dc315
Commit e46dc315 authored Apr 07, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 17 deletions

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

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
@@ -28,18 +28,8 @@ export default {
      type: String,
      required: false,
      default: '',
-<<<<<<< HEAD
-=======
-    },
-    actionDisabled: {
-      type: String,
-      required: false,
-      default: null,
->>>>>>> upstream/master
-    },
    },

-<<<<<<< HEAD
    actionDisabled: {
      type: String,
      required: false,
@@ -56,13 +46,6 @@ export default {
      return list[0];
    },

-=======
-  methods: {
-    firstJob(list) {
-      return list[0];
-    },
-
->>>>>>> upstream/master
    jobId(job) {
      return `ci-badge-${job.name}`;
    },