Remove conflict indicator

From-SVN: r39862

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 52042ac2d2bb456bb058e36497dbd69c5e025d73..208a73dcc09d577d196520b150e97af72702f620 100644 (file)
--- 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.