* Fixed an old svn-conflict in tests/test/README

git-svn-id: trunk@6167 -
This commit is contained in:
chrivers 2007-01-24 16:25:40 +00:00
parent e1c994a3be
commit c1dddf5df2

View File

@ -79,11 +79,8 @@ Floating Point ........ tfpu1.pp
tfpu2.pp tfpu2.pp
Assembler readers...... tasmread.pp tests for support of unit or program specifier Assembler readers...... tasmread.pp tests for support of unit or program specifier
testmovd.pp testspecial issues about MOVD instruction testmovd.pp testspecial issues about MOVD instruction
<<<<<<< README
Variants............... tvariant.pp tests the variant support of FPC Variants............... tvariant.pp tests the variant support of FPC
=======
tasout.pp tests a problem if a unit is compiled with nasm tasout.pp tests a problem if a unit is compiled with nasm
>>>>>>> 1.13
-------------------------------------------------------------------- --------------------------------------------------------------------
RTL RTL