ChangeLog: Remove extraneous '>>>>'.
2003-11-04 Jeffrey D. Oldham <oldham@codesourcery.com> * ChangeLog: Remove extraneous '>>>>'. From-SVN: r73264
This commit is contained in:
parent
d30b600a6e
commit
c1fab4c1be
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue