* gcc/testsuite/Changelog: previous commit scrambled Changelog.

From-SVN: r96895

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4b33170e1b34066c53dec45a4efc9409d5b2b0d6..95fa9495bfdd02807cc2656b9200f8cf36c2317a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -73,7 +73,6 @@
        * gcc.c-torture/compile/pr20539-1.c: Likewise.
        * g++.dg/opt/pr13066-1.C: Likewise.
 
->>>>>>> 1.5197
 2005-03-20  Joseph S. Myers  <joseph@codesourcery.com>
 
        * gcc.dg/bitfld-14.c, gcc.dg/enum3.c: New tests.