Fix conflicts in mr_widget_options.js

bb6f087b · Jan Provaznik · c35c549d · bb6f087b
Commit bb6f087b authored Jan 05, 2018 by Jan Provaznik
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js ...javascripts/vue_merge_request_widget/mr_widget_options.js +0 -3

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
@@ -81,10 +81,7 @@ export default {
        statusPath: store.statusPath,
        mergeActionsContentPath: store.mergeActionsContentPath,
        rebasePath: store.rebasePath,
-<<<<<<< HEAD
        approvalsPath: store.approvalsPath,
-=======
->>>>>>> upstream/master
      };
      return new MRWidgetService(endpoints);
    },