diff options
| author | Andreas Schwab <schwab@gcc.gnu.org> | 2006-06-23 09:41:38 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2006-06-23 09:41:38 +0000 |
| commit | 410ed785dd9560b052318fe9bd4f41cdc12ef7ed (patch) | |
| tree | 4b1223fcbb77a068f74b1b3e9474e90eb5b97e80 | |
| parent | 4e2bb0a4b816a3dc9dbcd871c6ad8e9c678146a5 (diff) | |
| download | gcc-410ed785dd9560b052318fe9bd4f41cdc12ef7ed.zip gcc-410ed785dd9560b052318fe9bd4f41cdc12ef7ed.tar.gz gcc-410ed785dd9560b052318fe9bd4f41cdc12ef7ed.tar.bz2 | |
Remove conflict marker.
From-SVN: r114928
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 28eda6e..b3c1fe3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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. |