Resolve spec/workers/project_cache_worker_spec.rb

spec/workers/project_cache_worker_spec.rb

@@ -45,7 +45,6 @@ describe ProjectCacheWorker do
         expect_any_instance_of(Repository).to receive(:refresh_method_caches)
           .with(%i(readme))
           .and_call_original
-<<<<<<< HEAD
 
         worker.perform(project.id, %w(readme))
       end
@@ -62,12 +61,8 @@ describe ProjectCacheWorker do
           expect_any_instance_of(Project).not_to receive(:update_repository_size)
           expect_any_instance_of(Project).not_to receive(:update_commit_count)
 
-          subject.perform(project.id)
+          worker.perform(project.id, %w(readme))
         end
-=======
-
-        worker.perform(project.id, %w(readme))
->>>>>>> upstream/master
       end
 
       context 'with plain readme' do