remove stray conflict marker

From-SVN: r83544
2004-06-23 08:43:25 +00:00 · 2004-06-23 08:43:25 +00:00 · 60bca1329b
parent c8619b9056
commit 60bca1329b
1 changed files with 0 additions and 1 deletions
--- 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