From: Andreas Schwab <schwab@gcc.gnu.org>
Date: Wed, 16 Jun 2004 10:45:58 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=58b9accaebab8fc4ee05a52f6698c24e8bfa65e2;p=gcc.git

Remove conflict marker.

From-SVN: r83234
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6c14abba3d2..a6ad3faa1f2 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,