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

d795b828 · Mike Greiling · 1a070027 · d795b828
Commit d795b828 authored Sep 24, 2018 by Mike Greiling
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

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
@@ -69,13 +69,9 @@ export default {
          v-for="(job, index) in jobs"
          :id="jobId(job)"
          :key="job.id"
-<<<<<<< HEAD
          :class="{
            'left-connector': index === 0 && (!isFirstColumn || hasTriggeredBy)
          }"
-=======
-          :class="buildConnnectorClass(index)"
->>>>>>> upstream/master
          class="build"
        >