Commit 600e1b0e authored by Winnie Hellmann's avatar Winnie Hellmann

Resolve conflict in ee_switch_state_maps.js

parent c0864cab
<<<<<<< HEAD
import stateMaps from 'ee/vue_merge_request_widget/stores/state_maps'; import stateMaps from 'ee/vue_merge_request_widget/stores/state_maps';
=======
import stateMaps from './state_maps';
>>>>>>> upstream/master
export default stateMaps; export default stateMaps;
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