Remove conflict marker.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114928 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 28eda6e..b3c1fe3 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.