projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 263c6fa)
Remove conflict marker.
authorAndreas Jaeger <aj@gcc.gnu.org>
Tue, 19 Mar 2002 20:02:52 +0000 (21:02 +0100)
committerAndreas Jaeger <aj@gcc.gnu.org>
Tue, 19 Mar 2002 20:02:52 +0000 (21:02 +0100)
From-SVN: r51036

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af67a5705dfc7ea6c17c368a94e755db0e19bf85..2f3b701864c5c54315774dd56261192a67a7ccfe 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