Resolve stage_column_component

app/assets/javascripts/pipelines/components/graph/stage_column_component.vue

@@ -13,25 +13,11 @@
         required: true,
       },
 
-<<<<<<< HEAD
       jobs: {
         type: Array,
         required: true,
       },
 
-=======
-    props: {
-      title: {
-        type: String,
-        required: true,
-      },
-
-      jobs: {
-        type: Array,
-        required: true,
-      },
-
->>>>>>> upstream/master
       isFirstColumn: {
         type: Boolean,
         required: false,
@@ -43,33 +29,20 @@
         required: false,
         default: '',
       },
-<<<<<<< HEAD
       hasTriggeredBy: {
         type: Boolean,
         required: true,
       },
-=======
->>>>>>> upstream/master
     },
 
     methods: {
       firstJob(list) {
         return list[0];
       },
-<<<<<<< HEAD
-
-      jobId(job) {
-        return `ci-badge-${job.name}`;
-=======
 
       jobId(job) {
         return `ci-badge-${job.name}`;
       },
-
-      buildConnnectorClass(index) {
-        return index === 0 && !this.isFirstColumn ? 'left-connector' : '';
->>>>>>> upstream/master
-      },
     },
   };
 </script>
@@ -86,16 +59,10 @@
           v-for="(job, index) in jobs"
           :key="job.id"
           class="build"
-<<<<<<< HEAD
           :class="{
             'left-connector': index === 0 && (!isFirstColumn || hasTriggeredBy)
           }"
           :id="jobId(job)">
-=======
-          :class="buildConnnectorClass(index)"
-          :id="jobId(job)"
-        >
->>>>>>> upstream/master
 
           <div class="curve"></div>