CE->EE: Fix conflicts in foreground verification code

lib/gitlab/verify/lfs_objects.rb

 module Gitlab
   module Verify
     class LfsObjects < BatchVerifier
-<<<<<<< HEAD
       prepend ::EE::Gitlab::Verify::LfsObjects
 
-=======
->>>>>>> upstream/master
       def name
         'LFS objects'
       end

lib/gitlab/verify/uploads.rb

 module Gitlab
   module Verify
     class Uploads < BatchVerifier
-<<<<<<< HEAD
       prepend ::EE::Gitlab::Verify::Uploads
 
-=======
->>>>>>> upstream/master
       def name
         'Uploads'
       end

spec/factories/lfs_objects.rb

@@ -15,11 +15,8 @@ FactoryBot.define do
   trait :correct_oid do
     oid 'b804383982bb89b00e828e3f44c038cc991d3d1768009fc39ba8e2c081b9fb75'
   end
-<<<<<<< HEAD
 
   trait :object_storage do
     file_store { LfsObjectUploader::Store::REMOTE }
   end
-=======
->>>>>>> upstream/master
 end