projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 561af70)
Fix merge conflict.
authorBenjamin Kosnik <bkoz@gcc.gnu.org>
Sat, 9 Aug 2003 01:43:18 +0000 (01:43 +0000)
committerBenjamin Kosnik <bkoz@gcc.gnu.org>
Sat, 9 Aug 2003 01:43:18 +0000 (01:43 +0000)
From-SVN: r70269

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2f0d775cd13cdd22e23a5f29d9c36fedfeb0a5ab..a8faf991ababee776be00f93d940e1db081fe5d7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -333,7 +333,6 @@
        * testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc: 
         Same.
        
->>>>>>> 1.1912
 2003-07-28  Phil Edwards  <pme@gcc.gnu.org>
 
        * docs/doxygen/user.cfg.in, docs/html/abi.txt, docs/html/debug.html,