projects / platform / upstream / linaro-gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a3aeaff)
Fix merge conflict.
authorbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 9 Aug 2003 01:43:18 +0000 (01:43 +0000)
committerbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 9 Aug 2003 01:43:18 +0000 (01:43 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70269 138bc75d-0d04-0410-961f-82ee72b054a4

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2f0d775..a8faf99 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,
Domain: System / Toolchain;