From 01063d48ed40614f1faad8c74207a2d64b1ab255 Mon Sep 17 00:00:00 2001
From: Feng Wang <fengwang@gcc.gnu.org>
Date: Wed, 18 May 2005 09:56:46 +0000
Subject: [PATCH] fix ChangeLog conflict.

From-SVN: r99893
---
 gcc/testsuite/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 38f657905ed..45bdf065123 100644
--- 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.
-- 
2.30.2