Fix conflict in app/finders/users_finder.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/finders/users_finder.rb

@@ -80,15 +80,12 @@ class UsersFinder
     users.external
   end
 
-<<<<<<< HEAD
   def by_non_ldap(users)
     return users unless params[:skip_ldap]
 
     users.non_ldap
   end
 
-=======
->>>>>>> upstream/master
   def by_2fa(users)
     case params[:two_factor]
     when 'enabled'