Remove ">>>>>>> .r123627".

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

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