Resolve conflict in ee_switch_get_state_key.js

071c4d46 · Winnie Hellmann · ba8932b2 · 071c4d46
Commit 071c4d46 authored Oct 26, 2018 by Winnie Hellmann
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js ...ue_merge_request_widget/stores/ee_switch_get_state_key.js +0 -4

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js
-<<<<<<< HEAD
 import getStateKey from 'ee/vue_merge_request_widget/stores/get_state_key';
-=======
-import getStateKey from './get_state_key';
->>>>>>> upstream/master
 export default getStateKey;