Fix conflict in app/services/search/group_service.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/services/search/group_service.rb

@@ -17,7 +17,6 @@ module Search
 
       @projects = super.inside_path(group.full_path)
     end
-<<<<<<< HEAD
 
     # rubocop: disable CodeReuse/ActiveRecord
     def elastic_projects
@@ -28,7 +27,5 @@ module Search
     def elastic_global
       false
     end
-=======
->>>>>>> upstream/master
   end
 end