From: pinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 24 Sep 2008 22:49:54 +0000 (+0000)
Subject: Remove conflict mark.
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=e007ff7085742119bc8c9c38583e2ae56bfa7c3a;p=pf3gnuchains%2Fgcc-fork.git

Remove conflict mark.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2faf9bd60b7..2e2db7b87c9 100644
--- 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,