fix ChangeLog conflict.
commit72367600ac6faca77620eff22ec0506505c3389b
authorfengwang <fengwang@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 18 May 2005 09:56:46 +0000 (18 09:56 +0000)
committerfengwang <fengwang@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 18 May 2005 09:56:46 +0000 (18 09:56 +0000)
treebb9b0a7a644071e5a33d7e21c376d9ecb2cad288
parent41dc7285f828a75a6c0c04b51896880a7e9a54cf
fix ChangeLog conflict.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99893 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/testsuite/ChangeLog