Resolve conflict in ee_switch_state_maps.js

600e1b0e · Winnie Hellmann · c0864cab · 600e1b0e
Commit 600e1b0e authored Oct 26, 2018 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_state_maps.js ...s/vue_merge_request_widget/stores/ee_switch_state_maps.js +0 -4

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