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

Remove conflict marker.

Browse source 
From-SVN: r114928
This commit is contained in:
Andreas Schwab 2006-06-23 09:41:38 +00:00
parent 4e2bb0a4b8
commit 410ed785dd
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

@ -35,7 +35,6 @@
* reload1.c (gen_reload): Call mark_jump_label on the new insns
generated by gen_move_insn to add REG_LABEL notes if necessary.
>>>>>>> .r114926
2006-06-22 Bob Wilson <bob.wilson@acm.org>
* config/xtensa/lib1funcs.asm (MIN_ESA): Delete.