Resolve merge conflits

config/initializers/7_omniauth.rb

-<<<<<<< HEAD
-module OmniAuth::Strategies
+if Gitlab::LDAP::Config.enabled?
+  module OmniAuth::Strategies
     Gitlab::LDAP::Config.servers.each do |server|
       # do not redeclare LDAP
       next if server['provider_name'] == 'ldap'
       const_set(server['provider_class'], Class.new(LDAP))
     end
-end
-
-OmniauthCallbacksController.class_eval do
-  Gitlab::LDAP::Config.servers.each do |server|
-    alias_method server['provider_name'], :ldap
-  end
-end
-=======
-if Gitlab::LDAP::Config.enabled?
-  module OmniAuth::Strategies
-    server = Gitlab.config.ldap.servers.values.first
-    const_set(server['provider_class'], Class.new(LDAP))
   end
 
   OmniauthCallbacksController.class_eval do
-    server = Gitlab.config.ldap.servers.values.first
+    Gitlab::LDAP::Config.servers.each do |server|
       alias_method server['provider_name'], :ldap
     end
+  end
 end
\ No newline at end of file
->>>>>>> d6fdca9a88356c9844e3597846044959bd765949

config/initializers/devise.rb

@@ -204,13 +204,8 @@ Devise.setup do |config|
   #   manager.default_strategies(scope: :user).unshift :some_external_strategy
   # end
 
-<<<<<<< HEAD
-  if Gitlab.config.ldap.enabled
-    Gitlab::LDAP::Config.servers.each do |server|
-=======
   if Gitlab::LDAP::Config.enabled?
-    Gitlab.config.ldap.servers.values.each do |server|
->>>>>>> d6fdca9a88356c9844e3597846044959bd765949
+    Gitlab::LDAP::Config.servers.each do |server|
       if server['allow_username_or_email_login']
         email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')}
       else