From 7dc5e63544e434b07f0fcc0737a4caa371e5457b Mon Sep 17 00:00:00 2001
From: Mike Stump <mrs@gcc.gnu.org>
Date: Tue, 17 May 2005 20:13:02 +0000
Subject: [PATCH] Remove typo.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 127f1049574f..1dffbedeb275 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -81,7 +81,6 @@
 	* cfgloopanal.c (just_once_each_iteration_p): Make the loop argument
 	const.
 
->>>>>>> 2.8834
 2005-05-17  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	* ggc-page.c (ggc_alloc_stat): Record amount of memory allocated.