aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJeffrey D. Oldham <oldham@gcc.gnu.org>2003-11-05 04:38:44 +0000
committerJeffrey D. Oldham <oldham@gcc.gnu.org>2003-11-05 04:38:44 +0000
commitc1fab4c1be7b11a656786759ee9927761c1a9473 (patch)
tree4539a567e6f4ad584d91f5cb4d97cc583da709b1 /libstdc++-v3
parentd30b600a6e22cb030fa61cfcfb3970d6289c08f3 (diff)
downloadgcc-c1fab4c1be7b11a656786759ee9927761c1a9473.zip
gcc-c1fab4c1be7b11a656786759ee9927761c1a9473.tar.gz
gcc-c1fab4c1be7b11a656786759ee9927761c1a9473.tar.bz2
ChangeLog: Remove extraneous '>>>>'.
2003-11-04 Jeffrey D. Oldham <oldham@codesourcery.com> * ChangeLog: Remove extraneous '>>>>'. From-SVN: r73264
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9066d60..8a54ea2 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):