Fix conflict

95fdad8c · Filipa Lacerda · cbd2f057 · 95fdad8c
Commit 95fdad8c authored Jan 30, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_report_collapsible_section.vue ...idget/components/mr_widget_report_collapsible_section.vue +0 -3

No files found.
--- a/ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_report_collapsible_section.vue
+++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_report_collapsible_section.vue
 <script>
-<<<<<<< HEAD
-=======
  import { __ } from '~/locale';
->>>>>>> master
  import statusIcon from '~/vue_merge_request_widget/components/mr_widget_status_icon.vue';
  import loadingIcon from '~/vue_shared/components/loading_icon.vue';
  import issuesBlock from './mr_widget_report_issues.vue';