# Conflicts:
#	.haml-lint.yml
#	Gemfile
#	Gemfile.lock
#	app/assets/javascripts/api.js
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/new_sidebar.js
#	app/assets/javascripts/project_select.js
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
#	app/assets/javascripts/vue_me...