Remove conflict marker.

From-SVN: r114928

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 28eda6eb3464b9ed82a1e792f5acbc4f7fcbe031..b3c1fe3a0b8322811d2685ca76898375c5868ce6 100644 (file)
--- 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.