From: François-Xavier Coudert <fxcoudert@gcc.gnu.org>
Date: Tue, 22 Mar 2005 22:09:27 +0000 (+0000)
Subject: * gcc/testsuite/Changelog: previous commit scrambled Changelog.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0dc8f32738b22686e14d8eb32ffcb05c10cb28dd;p=gcc.git

* gcc/testsuite/Changelog: previous commit scrambled Changelog.

From-SVN: r96895
---

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.