From d901e1272189dff7077842cebcc8aa745092edd0 Mon Sep 17 00:00:00 2001
From: bje <bje@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 15 Aug 2007 00:40:52 +0000
Subject: [PATCH] Remove stray conflict marker.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127504 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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