ChangeLog: Remove extraneous '>>>>'.

2003-11-04 Jeffrey D. Oldham <oldham@codesourcery.com> * ChangeLog: Remove extraneous '>>>>'. From-SVN: r73264

ChangeLog: Remove extraneous '>>>>'.
2003-11-04 Jeffrey D. Oldham <oldham@codesourcery.com> * ChangeLog: Remove extraneous '>>>>'. From-SVN: r73264
c1fab4c1 · Jeffrey D. Oldham · d30b600a · c1fab4c1
Commit c1fab4c1 authored Nov 05, 2003 by Jeffrey D. Oldham
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

libstdc++-v3/ChangeLog
+0 -1

No files found.
--- 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):