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

spec/services/lfs/lock_file_service_spec.rb

@@ -57,7 +57,6 @@ describe Lfs::LockFileService do
           expect(subject.execute[:status]).to eq(:error)
         end
       end
-<<<<<<< HEAD
 
       context 'when File Locking is available' do
         before do
@@ -78,8 +77,6 @@ describe Lfs::LockFileService do
           expect { subject.execute }.not_to change { PathLock.count }
         end
       end
-=======
->>>>>>> upstream/master
     end
   end
 end