* ChangeLog: Resolve conflict.

From-SVN: r43887

* ChangeLog: Resolve conflict.
From-SVN: r43887
4c1643f8 · Neil Booth · 2b1d9dc0 · 4c1643f8
Commit 4c1643f8 authored Jul 10, 2001 by Neil Booth
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

gcc/ChangeLog
+0 -5

No files found.
--- 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>