Commit c0864cab authored by Winnie Hellmann's avatar Winnie Hellmann

Resolve conflict in ee_switch_mr_widget_store.js

parent 071c4d46
<<<<<<< HEAD
import MergeRequestStore from 'ee/vue_merge_request_widget/stores/mr_widget_store';
=======
import MergeRequestStore from './mr_widget_store';
>>>>>>> upstream/master
export default MergeRequestStore;
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