fix ChangeLog conflict.
authorFeng Wang <fengwang@gcc.gnu.org>
Wed, 18 May 2005 09:56:46 +0000 (09:56 +0000)
committerFeng Wang <fengwang@gcc.gnu.org>
Wed, 18 May 2005 09:56:46 +0000 (09:56 +0000)
commit01063d48ed40614f1faad8c74207a2d64b1ab255
treebb9b0a7a644071e5a33d7e21c376d9ecb2cad288
parent1e7d0a6431a7a75998d0923aeb7acc358b4d4909
fix ChangeLog conflict.

From-SVN: r99893
gcc/testsuite/ChangeLog