diff options
| author | Ben Elliston <bje@gcc.gnu.org> | 2007-08-15 10:40:52 +1000 |
|---|---|---|
| committer | Ben Elliston <bje@gcc.gnu.org> | 2007-08-15 10:40:52 +1000 |
| commit | b331beb75c4d19ff67e636e929062defd3eeb0a0 (patch) | |
| tree | c5a89b70916d7fa6f6e1bedcba6fb69e6eda0b4b | |
| parent | 991df44f3a392709a7bbaf30d618582e9ab62a2b (diff) | |
| download | gcc-b331beb75c4d19ff67e636e929062defd3eeb0a0.zip gcc-b331beb75c4d19ff67e636e929062defd3eeb0a0.tar.gz gcc-b331beb75c4d19ff67e636e929062defd3eeb0a0.tar.bz2 | |
Remove stray conflict marker.
From-SVN: r127504
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 11d3ad8..bc33571 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -404,7 +404,6 @@ * emit-rtl.c (try_split): Relink the insns with REG_LIBCALL note and with REG_RETVAL note after split. ->>>>>>> .r127481 2007-08-11 David Daney <ddaney@avtrex.com> * config/mips/mips.c (mips_sched_reorder): Mark cycle parameter |