Remove conflict marker.
authorKriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org>
Sat, 16 Dec 2000 08:16:09 +0000 (08:16 +0000)
committerKriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org>
Sat, 16 Dec 2000 08:16:09 +0000 (08:16 +0000)
commita472a8887b00197b000168866e8cb278b119c044
tree271d0eb337c20906a2a4bf4a75dd5d6410e1dcea
parent221c7a7ff73fc1c9eef3ae5238bcfa2c7ae5e33a
Remove conflict marker.

From-SVN: r38303
gcc/testsuite/ChangeLog