Fix merge conflict.

From-SVN: r70269

Fix merge conflict.
From-SVN: r70269
0f492da1 · Benjamin Kosnik · 561af708 · 0f492da1
Commit 0f492da1 authored Aug 09, 2003 by Benjamin Kosnik
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

libstdc++-v3/ChangeLog
+0 -1

No files found.
--- 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,