Reolving conflict in adapter.rb

8de362b3 · Francisco Javier López · e69226c0 · 8de362b3
Commit 8de362b3 authored Apr 04, 2018 by Francisco Javier López
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/auth/ldap/adapter.rb lib/gitlab/auth/ldap/adapter.rb +0 -3

No files found.
--- a/lib/gitlab/auth/ldap/adapter.rb
+++ b/lib/gitlab/auth/ldap/adapter.rb
@@ -2,11 +2,8 @@ module Gitlab
  module Auth
    module LDAP
      class Adapter
-<<<<<<< HEAD
        prepend ::EE::Gitlab::Auth::LDAP::Adapter

-=======
->>>>>>> upstream/master
        SEARCH_RETRY_FACTOR = [1, 1, 2, 3].freeze
        MAX_SEARCH_RETRIES = Rails.env.test? ? 1 : SEARCH_RETRY_FACTOR.size.freeze