From 85763ceeb81bf97fb3489bfaff7d0bd3e4061104 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@gcc.gnu.org>
Date: Tue, 19 Mar 2002 21:02:52 +0100
Subject: Remove conflict marker.

From-SVN: r51036
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af67a57..2f3b701 100644
--- 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
-- 
cgit v1.1