From 24fbb6038f8768e9a8e7ad118abfd18b9f6aa221 Mon Sep 17 00:00:00 2001
From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 6 Apr 2007 21:24:17 +0000
Subject: [PATCH] Remove ">>>>>>> .r123627".

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123629 138bc75d-0d04-0410-961f-82ee72b054a4
---
 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
-- 
2.11.4.GIT