From: Jeffrey D. Oldham <oldham@gcc.gnu.org>
Date: Wed, 5 Nov 2003 04:38:44 +0000 (+0000)
Subject: ChangeLog: Remove extraneous '>>>>'.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1fab4c1be7b11a656786759ee9927761c1a9473;p=gcc.git

ChangeLog: Remove extraneous '>>>>'.

2003-11-04  Jeffrey D. Oldham  <oldham@codesourcery.com>

	* ChangeLog: Remove extraneous '>>>>'.

From-SVN: r73264
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9066d6096bf..8a54ea2966c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -109,7 +109,6 @@
 	* include/bits/istream.tcc: Same.
 	* include/bits/ostream.tcc: Same.
 
->>>>>>> 1.2063
 2003-10-30  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/locale_facets.tcc (time_get::_M_extract_via_format):