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

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

 <script>
 import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
 import StageColumnComponent from './stage_column_component.vue';
-<<<<<<< HEAD
 import LinkedPipelinesColumn from 'ee/pipelines/components/graph/linked_pipelines_column.vue'; // eslint-disable-line import/first
 
 export default {
@@ -10,15 +9,6 @@ export default {
     StageColumnComponent,
     LoadingIcon,
   },
-=======
-
-export default {
-  components: {
-    StageColumnComponent,
-    LoadingIcon,
-  },
-
->>>>>>> upstream/master
   props: {
     isLoading: {
       type: Boolean,
@@ -38,7 +28,6 @@ export default {
   computed: {
     graph() {
       return this.pipeline.details && this.pipeline.details.stages;
-<<<<<<< HEAD
     },
     triggered() {
       return this.pipeline.triggered || [];
@@ -53,9 +42,6 @@ export default {
     hasTriggeredBy() {
       return !!this.triggeredBy.length;
     },
-=======
-    },
->>>>>>> upstream/master
   },
 
   methods: {
@@ -120,10 +106,7 @@ export default {
           :stage-connector-class="stageConnectorClass(index, stage)"
           :is-first-column="isFirstColumn(index)"
           :action-disabled="actionDisabled"
-<<<<<<< HEAD
           :has-triggered-by="hasTriggeredBy"
-=======
->>>>>>> upstream/master
         />
       </ul>