Resolve lib/gitlab/ldap/access.rb[ci skip]

200fc04b · Valery Sizov · dca545fc · 200fc04b
Commit 200fc04b authored Jun 27, 2017 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -19,10 +19,7 @@ module Gitlab
          # Whether user is allowed, or not, we should update
          # permissions to keep things clean
          if access.allowed?
-<<<<<<< HEAD
            access.update_user
-=======
->>>>>>> c00e5bfa065128c5212a991a5cfcb6f152981d51
            Users::UpdateService.new(user, last_credential_check_a: Time.now).execute

            true