Resolve conflict in ee_switch_mr_widget_store.js

c0864cab · Winnie Hellmann · 071c4d46 · c0864cab
Commit c0864cab 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_mr_widget_store.js ..._merge_request_widget/stores/ee_switch_mr_widget_store.js +0 -4

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_mr_widget_store.js
-<<<<<<< HEAD
 import MergeRequestStore from 'ee/vue_merge_request_widget/stores/mr_widget_store';
-=======
-import MergeRequestStore from './mr_widget_store';
->>>>>>> upstream/master

 export default MergeRequestStore;