Resolve lib/gitlab/auth/ldap/access.rb

a7489f4a · Robert Speicher · 7248ad97 · a7489f4a
Commit a7489f4a authored May 18, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

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

-=======
->>>>>>> upstream/master
        attr_reader :provider, :user, :ldap_identity

        def self.open(user, &block)