From b331beb75c4d19ff67e636e929062defd3eeb0a0 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gcc.gnu.org>
Date: Wed, 15 Aug 2007 10:40:52 +1000
Subject: Remove stray conflict marker.

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

(limited to 'gcc')

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
-- 
cgit v1.1