From 410ed785dd9560b052318fe9bd4f41cdc12ef7ed Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@gcc.gnu.org>
Date: Fri, 23 Jun 2006 09:41:38 +0000
Subject: [PATCH] Remove conflict marker.

From-SVN: r114928
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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