From 58b9accaebab8fc4ee05a52f6698c24e8bfa65e2 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@gcc.gnu.org>
Date: Wed, 16 Jun 2004 10:45:58 +0000
Subject: [PATCH] Remove conflict marker.

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

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,
-- 
2.30.2