fix ChangeLog conflict.

From-SVN: r99893

fix ChangeLog conflict.
From-SVN: r99893
01063d48 · Feng Wang · 1e7d0a64 · 01063d48
Commit 01063d48 authored May 18, 2005 by Feng Wang
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/testsuite/ChangeLog
+0 -1

No files found.
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -31,7 +31,6 @@
 	libiberty.h.
 	* gcc.dg/compat/generate-random_r.c: Likewise.

->>>>>>> 1.5488
 2005-05-17  Paolo Bonzini  <bonzini@gnu.org>

 	* gcc.dg/fold-div-1.c, gcc.dg/recip-1.c, gcc.dg/recip-2.c: New.