Resolve conflict in lib/api/search.rb

01528bd5 · Robert Speicher · 3b1abfb9 · 01528bd5
Commit 01528bd5 authored Mar 19, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/lib/api/search.rb
+++ b/lib/api/search.rb
@@ -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