From 0dc8f32738b22686e14d8eb32ffcb05c10cb28dd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois-Xavier=20Coudert?= <fxcoudert@gcc.gnu.org>
Date: Tue, 22 Mar 2005 22:09:27 +0000
Subject: [PATCH] * gcc/testsuite/Changelog: previous commit scrambled
 Changelog.

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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4b33170e1b3..95fa9495bfd 100644
--- 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.
-- 
2.30.2