Fixed conflict in LDAP config file

efc9f9d9 · Francisco Javier López · 3a13063f · efc9f9d9
Commit efc9f9d9 authored Feb 15, 2018 by Francisco Javier López
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

lib/gitlab/ldap/config.rb lib/gitlab/ldap/config.rb +0 -6

No files found.
--- a/lib/gitlab/ldap/config.rb
+++ b/lib/gitlab/ldap/config.rb
@@ -19,13 +19,7 @@ module Gitlab
      end

      def self.servers
-<<<<<<< HEAD
-        Gitlab.config.ldap.servers.values
-      rescue Settingslogic::MissingSetting
-        []
-=======
        Gitlab.config.ldap['servers']&.values || []
->>>>>>> upstream/master
      end

      def self.available_servers