procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove stray conflict marker.

Browse source 
From-SVN: r127504
This commit is contained in:
Ben Elliston 2007-08-15 10:40:52 +10:00
parent 991df44f3a
commit b331beb75c
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gcc/ChangeLog
View file

@ -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