diff options
| author | Nathan Sidwell <nathan@gcc.gnu.org> | 2004-06-23 08:43:25 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2004-06-23 08:43:25 +0000 |
| commit | 60bca1329b31cdbc0feab8d9a2b5f617aee670de (patch) | |
| tree | 2ec4d90d4e1f9ed78e5b445796c1643d947cb410 /gcc | |
| parent | c8619b9056bcb98633301e3c13abb42fa4e027fa (diff) | |
| download | gcc-60bca1329b31cdbc0feab8d9a2b5f617aee670de.zip gcc-60bca1329b31cdbc0feab8d9a2b5f617aee670de.tar.gz gcc-60bca1329b31cdbc0feab8d9a2b5f617aee670de.tar.bz2 | |
remove stray conflict marker
From-SVN: r83544
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b496a34..4068b8d 100644 --- 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 |