Fix EE conflicts in mr_widget_pipeline.vue

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

@@ -4,10 +4,7 @@ import PipelineStage from '~/pipelines/components/stage.vue';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
-<<<<<<< HEAD
 import LinkedPipelinesMiniList from 'ee/vue_shared/components/linked_pipelines_mini_list.vue';
-=======
->>>>>>> upstream/master
 
 export default {
   name: 'MRWidgetPipeline',
@@ -16,10 +13,7 @@ export default {
     CiIcon,
     Icon,
     TooltipOnTruncate,
-<<<<<<< HEAD
     LinkedPipelinesMiniList,
-=======
->>>>>>> upstream/master
   },
   props: {
     pipeline: {