diff options
| author | Andreas Jaeger <aj@gcc.gnu.org> | 2002-03-19 21:02:52 +0100 |
|---|---|---|
| committer | Andreas Jaeger <aj@gcc.gnu.org> | 2002-03-19 21:02:52 +0100 |
| commit | 85763ceeb81bf97fb3489bfaff7d0bd3e4061104 (patch) | |
| tree | 5b247b53c392315d67b2079ec57fa98206dd5b78 | |
| parent | 263c6fa8401c24b1134abf91e84421fe15a1c1de (diff) | |
| download | gcc-85763ceeb81bf97fb3489bfaff7d0bd3e4061104.zip gcc-85763ceeb81bf97fb3489bfaff7d0bd3e4061104.tar.gz gcc-85763ceeb81bf97fb3489bfaff7d0bd3e4061104.tar.bz2 | |
Remove conflict marker.
From-SVN: r51036
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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 |