From 3c83544d6217312fff8dd1808e626e3c6188d449 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo@gcc.gnu.org>
Date: Sun, 2 Sep 2007 13:06:31 +0000
Subject: [PATCH] 2007-09-02  Paolo Carlini  <pcarlini@suse.de>

	* Remove junk in ChangeLog.

From-SVN: r128026
---
 gcc/cp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 43883e65973..4cb5476a499 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -62,7 +62,6 @@
 	(get_delta_difference_1): New function.
 	(get_delta_difference): Refactor to call get_delta_difference_1.
 
->>>>>>> .r127998
 2007-08-28  Paolo Carlini  <pcarlini@suse.de>
 
 	PR c++/33209
-- 
2.30.2