From: schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 16 Jun 2004 10:45:58 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f36ac1babad0f221882af5fae06490386b1d2e31;p=thirdparty%2Fgcc.git

Remove conflict marker.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83234 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6c14abba3d27..a6ad3faa1f2a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -41,7 +41,6 @@
 	decrease __nmatches and increase __i3 at once, only either of
 	the two; tidy.
 
->>>>>>> 1.2516
 2004-06-13  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/locale_facets.tcc (time_get<>::do_get_time,