Resolve search conflicts

app/services/search/global_service.rb

@@ -9,7 +9,6 @@ def initialize(user, params)
     end
 
     def execute
-<<<<<<< HEAD
       if current_application_settings.elasticsearch_search?
         Gitlab::Elastic::SearchResults.new(current_user, params[:search], elastic_projects, elastic_global)
       else
@@ -34,9 +33,6 @@ def elastic_projects
 
     def elastic_global
       true
-=======
-      Gitlab::SearchResults.new(current_user, projects, params[:search])
->>>>>>> ce/master
     end
 
     def projects

app/services/search/group_service.rb

@@ -14,7 +14,6 @@ def projects
 
       @projects = super.inside_path(group.full_path)
     end
-<<<<<<< HEAD
 
     def elastic_projects
       @elastic_projects ||= projects.pluck(:id)
@@ -23,7 +22,5 @@ def elastic_projects
     def elastic_global
       false
     end
-=======
->>>>>>> ce/master
   end
 end

spec/services/search/group_service_spec.rb

@@ -37,7 +37,6 @@
   describe 'basic search' do
     include_examples 'group search'
   end
-<<<<<<< HEAD
 
   describe 'elasticsearch' do
     before(:each) do
@@ -59,6 +58,4 @@
 
     include_examples 'group search'
   end
-=======
->>>>>>> ce/master
 end