Fix conflicts for...

Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue

Fix conflicts for...
Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
0a39e384 · Filipa Lacerda · bd2af642 · 0a39e384
Commit 0a39e384 authored Jan 25, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue ..._request_widget/components/states/mr_widget_conflicts.vue +0 -4

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
 <script>
-<<<<<<< HEAD
-  import statusIcon from '../mr_widget_status_icon';
-=======
  import statusIcon from '../mr_widget_status_icon.vue';
->>>>>>> upstream/master

  export default {
    name: 'MRWidgetConflicts',