Resolve conflict in ee_switch_mr_widget_service.js

ba8932b2 · Winnie Hellmann · 93e9966a · ba8932b2
Commit ba8932b2 authored Oct 26, 2018 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js ...ge_request_widget/services/ee_switch_mr_widget_service.js +0 -4

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js
+++ b/app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js
-<<<<<<< HEAD
 import MRWidgetService from 'ee/vue_merge_request_widget/services/mr_widget_service';
-=======
-import MRWidgetService from './mr_widget_service';
->>>>>>> upstream/master

 export default MRWidgetService;