Pārlūkot izejas kodu

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

git-svn-id: trunk@6167 -
chrivers 18 gadi atpakaļ
vecāks
revīzija
c1dddf5df2
1 mainītis faili ar 0 papildinājumiem un 3 dzēšanām
  1. 0 3
      tests/test/README

+ 0 - 3
tests/test/README

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