Skip to content

G
gitlab-ce
Commit bb6f087b authored by Jan Provaznik's avatar Jan Provaznik
Browse files
Options

Fix conflicts in mr_widget_options.js

parent c35c549d
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
View file @ bb6f087b
...@@ -81,10 +81,7 @@ export default { ...@@ -81,10 +81,7 @@ export default {
statusPath: store.statusPath, statusPath: store.statusPath,
mergeActionsContentPath: store.mergeActionsContentPath, mergeActionsContentPath: store.mergeActionsContentPath,
rebasePath: store.rebasePath, rebasePath: store.rebasePath,
<<<<<<< HEAD
approvalsPath: store.approvalsPath, approvalsPath: store.approvalsPath,
=======
>>>>>>> upstream/master
}; };
return new MRWidgetService(endpoints); return new MRWidgetService(endpoints);
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7