From: R. Kelley Cook <kcook@gcc.gnu.org>
Date: Thu, 16 Oct 2003 22:38:32 +0000 (+0000)
Subject: eliminate conflict indicator
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8e7e41aa978dff737b765151af8d7669bddaa5d;p=gcc.git

eliminate conflict indicator

From-SVN: r72583
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc4e49c38a6..836c8f5c86a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -55,7 +55,6 @@
 	(machopic_legitimize_pic_address): Improve codegen in dynamic-no-pic
 	case.
 
->>>>>>> 2.1435
 2003-10-15  Gábor Lóki  <alga@rgai.hu>
 
 	* fold-const.c (tree_swap_operands_p): Disable some features