Commit 071c4d46 authored by Winnie Hellmann's avatar Winnie Hellmann

Resolve conflict in ee_switch_get_state_key.js

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