# Conflicts:
#	Gemfile.lock
#	app/models/ci/build.rb
#	lib/gitlab/slash_commands/command.rb

[ci skip]