From 64199a9eedbd34833b7712d6da13d117fa3ef9f4 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl@gcc.gnu.org>
Date: Fri, 6 Apr 2007 14:24:17 -0700
Subject: [PATCH] Remove ">>>>>>> .r123627".

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eca498c96c7..d5f8559c1ac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -23,7 +23,6 @@
 	mode macro.
 	(*truncxf?f_i387 splitter): Ditto.
 
->>>>>>> .r123627
 2007-04-06  Daniel Berlin  <dberlin@dberlin.org>
 
 	* langhooks-def.h (LANG_HOOKS_INITIALIZER): Remove