Remove typo.
authormrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 17 May 2005 20:13:02 +0000 (20:13 +0000)
committermrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 17 May 2005 20:13:02 +0000 (20:13 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99859 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog

index 127f104..1dffbed 100644 (file)
@@ -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.