Fixed conflict in user.rb

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

Showing with 0 additions and 4 deletions

lib/gitlab/auth/o_auth/user.rb lib/gitlab/auth/o_auth/user.rb +0 -4

No files found.
--- a/lib/gitlab/auth/o_auth/user.rb
+++ b/lib/gitlab/auth/o_auth/user.rb
@@ -126,10 +126,6 @@ module Gitlab
          Gitlab::Auth::LDAP::Person.find_by_uid(auth_hash.uid, adapter) ||
            Gitlab::Auth::LDAP::Person.find_by_email(auth_hash.uid, adapter) ||
            Gitlab::Auth::LDAP::Person.find_by_dn(auth_hash.uid, adapter)
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master
        rescue Gitlab::Auth::LDAP::LDAPConnectionError
          nil
        end