projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d30b600)
ChangeLog: Remove extraneous '>>>>'.
authorJeffrey D. Oldham <oldham@gcc.gnu.org>
Wed, 5 Nov 2003 04:38:44 +0000 (04:38 +0000)
committerJeffrey D. Oldham <oldham@gcc.gnu.org>
Wed, 5 Nov 2003 04:38:44 +0000 (04:38 +0000)
2003-11-04  Jeffrey D. Oldham  <oldham@codesourcery.com>

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

From-SVN: r73264

libstdc++-v3/ChangeLog patch | blob | history

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9066d6096bfa4c93fcab6b233d9ad30b73876804..8a54ea2966c60deab4dc6ffccd0a4dd67f70580e 100644 (file)
--- 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):