This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Remove conflict marker from ChangeLog
- From: Andreas Jaeger <aj at suse dot de>
- To: gcc-patches at gcc dot gnu dot org
- Date: Tue, 19 Mar 2002 21:00:43 +0100
- Subject: Remove conflict marker from ChangeLog
I'm committing the appended patch as obvious - and without a
ChangeLog,
Andreas
============================================================
Index: gcc/ChangeLog
--- gcc/ChangeLog 2002/03/19 19:46:27 1.13415
+++ gcc/ChangeLog 2002/03/19 20:00:16
@@ -247,7 +247,6 @@ Sat Mar 16 12:57:28 CET 2002 Jan HUbick
(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
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
http://www.suse.de/~aj