From c6f3b5880ebe6b5359703cb43acb1cec6273f62d Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <redi@gcc.gnu.org>
Date: Tue, 5 Oct 2010 21:43:04 +0100
Subject: 2010-10-05  Jonathan Wakely  <jwakely.gcc@gmail.com>

	* Remove svn conflict marker in ChangeLog.

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

(limited to 'libstdc++-v3')

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c38d749..b6c4aca 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -145,7 +145,6 @@
 	* configure: Regenerate.
 	* include/Makefile.in: Likewise.
 
->>>>>>> .r164755
 2010-09-22  David Krauss  <potswa@mac.com>
 
 	PR libstdc++/45628
-- 
cgit v1.1