Conflicts:
	lib/onelogin/ruby-saml/settings.rb