From 0f492da1c87dd54dacd50dbdd02671ae751cf89c Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@gcc.gnu.org>
Date: Sat, 9 Aug 2003 01:43:18 +0000
Subject: [PATCH] Fix merge conflict.

From-SVN: r70269
---
 libstdc++-v3/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2f0d775cd13..a8faf991aba 100644
--- 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,
-- 
2.30.2