# Conflicts:
#	app/controllers/ldap/omniauth_callbacks_controller.rb
#	config/routes/user.rb
#	doc/ci/variables/README.md
#	doc/ci/yaml/README.md
#	lib/gitlab/auth/ldap/user.rb
#	lib/gitlab/auth/saml/user.rb

[ci skip]