Commit 85763cee by Andreas Jaeger

Remove conflict marker.

From-SVN: r51036
parent 263c6fa8
...@@ -247,7 +247,6 @@ Sat Mar 16 12:57:28 CET 2002 Jan HUbicka <jh@suse.cz> ...@@ -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. (COMMAND_LINE_OPTIONS): Remove OPT_MD, OPT_MMD.
(cpp_handle_option): Update. (cpp_handle_option): Update.
>>>>>>> 1.13408
2002-03-15 Chris Demetriou <cgd@broadcom.com> 2002-03-15 Chris Demetriou <cgd@broadcom.com>
* config/mips/mips.h (SUBTARGET_CPP_SIZE_SPEC): Provide an * config/mips/mips.h (SUBTARGET_CPP_SIZE_SPEC): Provide an
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment