fix ce-to-ee `spec/factories/uploads.rb`

spec/factories/uploads.rb

@@ -5,10 +5,7 @@ FactoryBot.define do
     uploader "AvatarUploader"
     mount_point :avatar
     secret nil
-<<<<<<< HEAD
     store ObjectStorage::Store::LOCAL
-=======
->>>>>>> upstream/master
 
     # we should build a mount agnostic upload by default
     transient do
@@ -19,32 +16,20 @@ FactoryBot.define do
     path { File.join("uploads/-/system", model.class.to_s.underscore, mount_point.to_s, 'avatar.jpg') }
 
     trait :personal_snippet_upload do
-<<<<<<< HEAD
-      model { build(:personal_snippet) }
-      path { File.join(secret, filename) }
-      uploader "PersonalFileUploader"
-=======
       uploader "PersonalFileUploader"
       path { File.join(secret, filename) }
       model { build(:personal_snippet) }
->>>>>>> upstream/master
       secret SecureRandom.hex
     end
 
     trait :issuable_upload do
-<<<<<<< HEAD
-      path { File.join(secret, filename) }
       uploader "FileUploader"
+      path { File.join(secret, filename) }
       secret SecureRandom.hex
     end
-
+    
     trait :object_storage do
       store ObjectStorage::Store::REMOTE
-=======
-      uploader "FileUploader"
-      path { File.join(secret, filename) }
-      secret SecureRandom.hex
->>>>>>> upstream/master
     end
 
     trait :namespace_upload do