Remove stray conflict marker.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 11d3ad8..bc33571 100644 (file)
--- 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