diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 11d3ad8e2a5..bc335714d71 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -404,7 +404,6 @@
 	* emit-rtl.c (try_split): Relink the insns with REG_LIBCALL note
 	and with REG_RETVAL note after split.
 
->>>>>>> .r127481
 2007-08-11  David Daney  <ddaney@avtrex.com>
 
 	* config/mips/mips.c (mips_sched_reorder):  Mark cycle parameter