# Conflicts:
#	app/assets/javascripts/pipelines/components/graph/graph_component.vue
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	lib/gitlab.rb
#	lib/settings.rb
#	spec/spec_helper.rb
#	spec/support/helpers/stub_configuration.rb

[ci skip]