diff options
| author | Wolfgang Bangerth <bangerth@gcc.gnu.org> | 2003-05-15 09:02:27 -0600 |
|---|---|---|
| committer | Wolfgang Bangerth <bangerth@gcc.gnu.org> | 2003-05-15 09:02:27 -0600 |
| commit | ce000d1eec7bc89409426551325a1ac6ba233193 (patch) | |
| tree | 2e1bf0fc46a6fa41a35f28efdce209d7885ad342 /gcc | |
| parent | 486772b126854e26f9dccf4fa6cd631757d7c045 (diff) | |
| download | gcc-ce000d1eec7bc89409426551325a1ac6ba233193.zip gcc-ce000d1eec7bc89409426551325a1ac6ba233193.tar.gz gcc-ce000d1eec7bc89409426551325a1ac6ba233193.tar.bz2 | |
Remove the residuals of a previous merge conflict.
From-SVN: r66826
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 4ffd196..5d4be0b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -587,7 +587,6 @@ Mon May 12 11:32:53 CEST 2003 Jan Hubicka <jh@suse.cz> (s390_function_arg): Likewise. (s390_va_arg): Likewise ->>>>>>> 1.17806 2003-05-11 Nathan Sidwell <nathan@codesourcery.com> * coverage.h (coverage_counter_alloc): New function. |