Resolve pipelines/components/graph/graph_component.vue

87fdd686 · Robert Speicher · 286e5094 · 87fdd686
Commit 87fdd686 authored May 17, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/pipelines/components/graph/graph_component.vue ...avascripts/pipelines/components/graph/graph_component.vue +0 -3

No files found.
--- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
@@ -105,10 +105,7 @@ export default {
          :stage-connector-class="stageConnectorClass(index, stage)"
          :is-first-column="isFirstColumn(index)"
          @refreshPipelineGraph="refreshPipelineGraph"
-<<<<<<< HEAD
          :has-triggered-by="hasTriggeredBy"
-=======
->>>>>>> upstream/master
        />
      </ul>