Fix conflicts for ...

Fix conflicts for  app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

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

@@ -72,7 +72,6 @@ export default {
         linkEnd: '</a>',
       });
     },
-<<<<<<< HEAD
     /* We typically set defaults ([]) in the store or prop declarations, but because triggered
     * and triggeredBy are appended to `pipeline`, we can't set defaults in the store, and we
     * need to check their length here to prevent initializing linked-pipeline-mini-lists
@@ -84,8 +83,6 @@ export default {
       const response = this.pipeline.triggered_by;
       return response ? [response] : [];
     },
-=======
->>>>>>> upstream/master
   },
 };
 </script>