mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-02-23 05:49:11 +08:00
remove stray conflict marker
From-SVN: r83544
This commit is contained in:
parent
c8619b9056
commit
60bca1329b
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user