Remove conflict mark.

From-SVN: r140651

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2faf9bd60b747e4d4f51691c75d84ec803cc5888..2e2db7b87c9dc8d6b903965f1bdb4d23f6e791e4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -148,14 +148,13 @@
 
 2008-09-23  Kai Tietz  <kai.tietz@onevision.com>
 
-       *config/i386/i386.c (ix86_function_ok_for_sibcall): Correct
+       * config/i386/i386.c (ix86_function_ok_for_sibcall): Correct
        check for sibcall support for w64.
 
 2008-09-23  Eric Botcazou  <ebotcazou@adacore.com>
 
        * c-ppoutput.c (cb_used_define): Do nothing for a builtin node.
 
->>>>>>> .r140641
 2008-09-23  Aldy Hernandez  <aldyh@redhat.com>
 
        * c-tree.h: Add argument to c_objc_common_truthvalue_conversion,