Resolve conflict in ee_switch_mr_widget_options.js

93e9966a · Winnie Hellmann · 68985a90 · 93e9966a
Commit 93e9966a 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/ee_switch_mr_widget_options.js ...s/vue_merge_request_widget/ee_switch_mr_widget_options.js +0 -4

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/ee_switch_mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/ee_switch_mr_widget_options.js
-<<<<<<< HEAD
 import MRWidgetOptions from 'ee/vue_merge_request_widget/mr_widget_options.vue';
-=======
-import MRWidgetOptions from './mr_widget_options.vue';
->>>>>>> upstream/master

 export default MRWidgetOptions;