Resolve app/finders/users_finder.rb

056d4e76 · Robert Speicher · 7d668d1d · 056d4e76
Commit 056d4e76 authored Sep 13, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/finders/users_finder.rb app/finders/users_finder.rb +0 -3

No files found.
--- a/app/finders/users_finder.rb
+++ b/app/finders/users_finder.rb
@@ -85,15 +85,12 @@ class UsersFinder
    users.external
  end
  # rubocop: enable CodeReuse/ActiveRecord
-<<<<<<< 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]