Remove conflict indicator

From-SVN: r37937

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 82cbc8f601432ca837cf6a6613149095bd50d54e..55af2da6f3152f99d9eecda4a9920e26acc95d7e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -544,7 +544,6 @@ Tue Nov 28 09:53:50 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
        Merge handling of -D and -U.  Update handling of pending
        directives.  Free the memory after use.
 
->>>>>>> 1.8477
 2000-11-27  Bernd Schmidt  <bernds@redhat.co.uk>
 
        * flow.c (entry_exit_blocks): Add entry for cond_local_set.