diff options
| author | Martin v. Löwis <loewis@gcc.gnu.org> | 2000-02-22 00:04:20 +0000 |
|---|---|---|
| committer | Martin v. Löwis <loewis@gcc.gnu.org> | 2000-02-22 00:04:20 +0000 |
| commit | 7d612b1e4af6e48292c986b4167afe057d7e798b (patch) | |
| tree | 47442366bbe15f8923c34ae87264cff7fbc232e5 /gcc | |
| parent | 2a1ed9c1118c22234087b5044d794cf526eccdc7 (diff) | |
| download | gcc-7d612b1e4af6e48292c986b4167afe057d7e798b.zip gcc-7d612b1e4af6e48292c986b4167afe057d7e798b.tar.gz gcc-7d612b1e4af6e48292c986b4167afe057d7e798b.tar.bz2 | |
Remove conflict marker
From-SVN: r32096
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8ad693a..ef3c26e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -145,7 +145,6 @@ Fri Feb 18 20:08:57 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> * config/alpha/alpha.h (INITIAL_ELIMINATION_OFFSET): Add abort in unhandled case. ->>>>>>> 1.5739 2000-02-18 Nick Clifton <nickc@cygnus.com> * config/arm/elf.h (ASM_OUTPUT_ALIGN): Do not generate |