Fix conflict for app/assets/javascripts/pipelines/components/graph/graph_component.vue

f45545ed · Filipa Lacerda · 60f0764e · f45545ed
Commit f45545ed authored Apr 23, 2018 by Filipa Lacerda
Show 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
@@ -106,10 +106,7 @@ export default {
          :stage-connector-class="stageConnectorClass(index, stage)"
          :is-first-column="isFirstColumn(index)"
          :request-finished-for="requestFinishedFor"
-<<<<<<< HEAD
          :has-triggered-by="hasTriggeredBy"
-=======
->>>>>>> upstream/master
        />
      </ul>