Resolving conflict with spec/services/lfs/unlock_file_service_spec.rb

spec/services/lfs/unlock_file_service_spec.rb

@@ -100,7 +100,6 @@ describe Lfs::UnlockFileService do
           end
         end
       end
-<<<<<<< HEAD
 
       describe 'File Locking integraction' do
         let(:params) { { id: lock.id } }
@@ -129,8 +128,6 @@ describe Lfs::UnlockFileService do
           end
         end
       end
-=======
->>>>>>> upstream/master
     end
   end
 end