Resolve conflicts in api/users

165833d3 · Jarka Kadlecová · 7c088f2f · 165833d3
Commit 165833d3 authored Feb 14, 2018 by Jarka Kadlecová
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/api/users.rb lib/api/users.rb +0 -3

No files found.
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -75,12 +75,9 @@ module API
        use :sort_params
        use :pagination
        use :with_custom_attributes
-<<<<<<< HEAD
        # EE
        optional :skip_ldap, type: Boolean, default: false, desc: 'Skip LDAP users'
-=======
->>>>>>> upstream/master
      end
      get do
        authenticated_as_admin! if params[:external].present? || (params[:extern_uid].present? && params[:provider].present?)