From c5217bf5380ac848a5673ff7271a865147d40dbf Mon Sep 17 00:00:00 2001
From: fxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 22 Mar 2005 22:09:27 +0000
Subject: [PATCH] 	* gcc/testsuite/Changelog: previous commit scrambled
 Changelog.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96895 138bc75d-0d04-0410-961f-82ee72b054a4
---
 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.11.4.GIT