# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
#	config/gitlab.yml.example
#	config/initializers/0_post_deployment_migrations.rb

[ci skip]