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 (file)
--- 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.