remove stray conflict marker

From-SVN: r83544

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b496a34f7ad58cb3a10664692e05d0a47b9c79af..4068b8d23ffde28282bcd08247019e7ef1b24b10 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3111,7 +3111,6 @@
        (expand_return): Don't check for possible tail recursion.
        * tree.h (optimize_tail_recursion): Remove prototype.
 
->>>>>>> 2.4079
 2004-06-02  Jan Hubicka  <jh@suse.cz>
 
        * tree-cfg.c (tree_find_edge_insert_loc):  Allow inserting before