# Conflicts:
#	app/assets/images/icons.json
#	app/assets/images/icons.svg
#	app/assets/javascripts/projects/project_new.js
#	app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
#	app/helpers/branches_helper.rb
#	app/models/concerns/deployment_platform.rb
#	doc/api/boards.md
#	doc/api/settings.md
#	lib/api/entities.rb
#	spec/fixtures/api/schemas/entities/merge_request_widget.json
#	spec/javascripts/lib/utils/text_utility_spec.js

[ci skip]