Commit 01528bd5 authored by Robert Speicher's avatar Robert Speicher

Resolve conflict in lib/api/search.rb

parent 3b1abfb9
......@@ -108,11 +108,8 @@ module API
use :pagination
end
get ':id/(-/)search' do
<<<<<<< HEAD
check_elasticsearch_scope!
=======
>>>>>>> upstream/master
present search(group_id: user_group.id), with: entity
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment