resolve ce-to-ee for file_uploader_spec.rb

spec/uploaders/file_uploader_spec.rb

@@ -66,7 +66,6 @@ describe FileUploader do
     end
   end
 
-<<<<<<< HEAD
   describe "#migrate!" do
     before do
       uploader.store!(fixture_file_upload(Rails.root.join('spec/fixtures/dk.png')))
@@ -77,8 +76,6 @@ describe FileUploader do
     it_behaves_like "migrates", from_store: described_class::Store::REMOTE, to_store: described_class::Store::LOCAL
   end
 
-=======
->>>>>>> upstream/master
   describe '#upload=' do
     let(:secret) { SecureRandom.hex }
     let(:upload) { create(:upload, :issuable_upload, secret: secret, filename: 'file.txt') }