Resolve conflict in spec/uploaders/object_storage_spec.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

spec/uploaders/object_storage_spec.rb

@@ -370,11 +370,8 @@ describe ObjectStorage do
     let(:has_length) { true }
     let(:maximum_size) { nil }
 
-<<<<<<< HEAD
-=======
     subject { uploader_class.workhorse_authorize(has_length: has_length, maximum_size: maximum_size) }
 
->>>>>>> upstream/master
     shared_examples 'uses local storage' do
       it "returns temporary path" do
         is_expected.to have_key(:TempPath)