From: mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 17 May 2005 20:13:02 +0000 (+0000)
Subject: Remove typo.
X-Git-Tag: upstream/4.9.2~61102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=012935045e8956d605ab5060190d51bff6d60424;p=platform%2Fupstream%2Flinaro-gcc.git

Remove typo.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99859 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 127f104..1dffbed 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.