Commit ba8932b2 authored by Winnie Hellmann's avatar Winnie Hellmann

Resolve conflict in ee_switch_mr_widget_service.js

parent 93e9966a
<<<<<<< HEAD
import MRWidgetService from 'ee/vue_merge_request_widget/services/mr_widget_service'; import MRWidgetService from 'ee/vue_merge_request_widget/services/mr_widget_service';
=======
import MRWidgetService from './mr_widget_service';
>>>>>>> upstream/master
export default MRWidgetService; export default MRWidgetService;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment