Remove stray conflict marker

From-SVN: r46386

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f0fe8e79e6be4ad6e475aa1a18bd6d7ef6a60bfd..e8cfc22df08a73b3f6fa880244288f61ef3a4489 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -90,7 +90,6 @@ Sat Oct 20 12:01:07 CEST 2001  Jan Hubicka  <jh@suse.cz>
        call run_directive directly.
        (_cpp_do__Pragma): Simplify.
 
->>>>>>> 1.11604
 2001-10-19  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * pe.c (arm_pe_unique_section): Const-ify.