Remove conflict marker.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51036 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af67a57..2f3b701 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -247,7 +247,6 @@ Sat Mar 16 12:57:28 CET 2002  Jan HUbicka  <jh@suse.cz>
        (COMMAND_LINE_OPTIONS): Remove OPT_MD, OPT_MMD.
        (cpp_handle_option): Update.
 
->>>>>>> 1.13408
 2002-03-15  Chris Demetriou  <cgd@broadcom.com>
 
        * config/mips/mips.h (SUBTARGET_CPP_SIZE_SPEC): Provide an