From: Neil Booth <neil@gcc.gnu.org>
Date: Tue, 10 Jul 2001 05:54:40 +0000 (+0000)
Subject: * ChangeLog: Resolve conflict.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4c1643f818ced4e9ad62fcaa9bb37695d8ea76af;p=gcc.git

* ChangeLog: Resolve conflict.

From-SVN: r43887
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1379c1a876..abf5bd46397 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -307,13 +307,8 @@ Mon Jul  9 06:41:07 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 	Delete.
 	* config/m88k/m88k.c (m88k_end_prologue, m88k_begin_epilogue): Rename
 	an use in target struct, make static.
-<<<<<<< ChangeLog
-	* ia64/ia64.h (FUNCTION_END_PROLOGUE, FUNCTION_BEGIN_EPILOGUE): Delete.
-=======
 	* config/ia64/ia64.h (FUNCTION_END_PROLOGUE, FUNCTION_BEGIN_EPILOGUE):
 	Delete.
->>>>>>> 1.10591
-
 
 2001-07-08  Richard Henderson  <rth@redhat.com>