# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	doc/user/project/web_ide/img/commit_changes.png
#	doc/user/project/web_ide/index.md
#	qa/qa/page/merge_request/show.rb

[ci skip]