From 51aff00b07c0058a85adc41688a021b155154dcc Mon Sep 17 00:00:00 2001
From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 5 Oct 2010 20:43:04 +0000
Subject: [PATCH] 2010-10-05  Jonathan Wakely  <jwakely.gcc@gmail.com>

	* Remove svn conflict marker in ChangeLog.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165001 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++-v3/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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
-- 
2.7.4