Resolve app/workers/post_receive.rb and app/models/project_wiki.rb[ci skip]

app/models/project_wiki.rb

@@ -197,12 +197,9 @@ class ProjectWiki
 
   def update_project_activity
     @project.touch(:last_activity_at, :last_repository_updated_at)
-<<<<<<< HEAD
   end
 
   def update_elastic_index
     index_blobs if current_application_settings.elasticsearch_indexing?
-=======
->>>>>>> 6ce1df41e175c7d62ca760b1e66cf1bf86150284
   end
 end

app/workers/post_receive.rb

@@ -16,7 +16,6 @@ class PostReceive
     # time and thread ID's.
     Sidekiq.logger.info "changes: #{changes.inspect}" if ENV['SIDEKIQ_LOG_ARGUMENTS']
     post_received = Gitlab::GitPostReceive.new(project, identifier, changes)
-<<<<<<< HEAD
 
     if is_wiki
       update_wiki_es_indexes(post_received)
@@ -36,12 +35,6 @@ class PostReceive
         SystemHooksService.new.execute_hooks(hook_data, :repository_update_hooks)
       end
 
-=======
-
-    if is_wiki
-      # Nothing defined here yet.
-    else
->>>>>>> 6ce1df41e175c7d62ca760b1e66cf1bf86150284
       process_project_changes(post_received)
     end
   end