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

From-SVN: r123629
This commit is contained in:
H.J. Lu 2007-04-06 14:24:17 -07:00
parent 4de5c5d3bf
commit 64199a9eed

View File

@ -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