projects / platform / upstream / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1e7d0a6)
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)
From-SVN: r99893

gcc/testsuite/ChangeLog patch | blob | history

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 38f6579..45bdf06 100644 (file)
--- 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.
Domain: System / Toolchain;