Browse Source

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

git-svn-id: trunk@6167 -
chrivers 18 năm trước cách đây
mục cha
commit
c1dddf5df2
1 tập tin đã thay đổi với 0 bổ sung3 xóa
  1. 0 3
      tests/test/README

+ 0 - 3
tests/test/README

@@ -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