Fix conflict in...

Fix conflict in app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue

app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue

@@ -18,17 +18,10 @@ export default {
 <template>
   <div class="mr-widget-body mr-widget-empty-state">
     <div class="row">
-<<<<<<< HEAD
-      <div class="artwork col-sm-5 order-md-last col-12 text-center">
-        <span v-html="emptyStateSVG"></span>
-      </div>
-      <div class="text col-sm-7 order-md-first col-12">
-=======
       <div class="artwork col-md-5 order-md-last col-12 text-center">
         <span v-html="emptyStateSVG"></span>
       </div>
       <div class="text col-md-7 order-md-first col-12">
->>>>>>> gitlab-ce/master
         <span>
           Merge requests are a place to propose changes you have made to a project
           and discuss those changes with others.