fix conflicts in app/finders/users_finder.rb

98448ca6 · Mike Greiling · 0be0cc3b · 98448ca6
Commit 98448ca6 authored Jul 07, 2017 by Mike Greiling
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
@@ -33,10 +33,7 @@ class UsersFinder
    users = by_external_identity(users)
    users = by_external(users)
    users = by_created_at(users)
-<<<<<<< HEAD
    users = by_non_ldap(users)
-=======
->>>>>>> master-ce

    users
  end