From: Richard Kenner <kenner@gcc.gnu.org>
Date: Mon, 19 Feb 2001 00:10:27 +0000 (-0500)
Subject: Remove conflict indicator
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=63aa1491fcaa66169d6f66490a514b95017c07f3;p=gcc.git

Remove conflict indicator

From-SVN: r39862
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 52042ac2d2b..208a73dcc09 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -19,7 +19,6 @@ Sun Feb 18 17:05:50 2001  Jeffrey A Law  (law@cygnus.com)
 	(rtx_varies_p, rtx_addr_can_trap_p): Similarly.
 
 Sun Feb 18 15:45:17 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
->>>>>>> 1.9328
 
 	* sibcall.c (optimize_sibling_and_tail_recursive_call): Compare
 	against last real insn in basic block.