diff options
| author | Warren Levy <warrenl@gcc.gnu.org> | 2000-06-28 11:26:42 +0000 |
|---|---|---|
| committer | Warren Levy <warrenl@gcc.gnu.org> | 2000-06-28 11:26:42 +0000 |
| commit | 580ac503925ca3b85efd84cc3cf666ad7f659ef7 (patch) | |
| tree | e7c0a9cb389fac28aff2d32e1c198fcd1dda1ae2 /libjava | |
| parent | 2017da526c1d50e7292ee9cd668c6c85d31b265f (diff) | |
| download | gcc-580ac503925ca3b85efd84cc3cf666ad7f659ef7.zip gcc-580ac503925ca3b85efd84cc3cf666ad7f659ef7.tar.gz gcc-580ac503925ca3b85efd84cc3cf666ad7f659ef7.tar.bz2 | |
Removed extraneous conflict marker.
From-SVN: r34754
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6c6bea8b..a7b1a17 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -674,7 +674,6 @@ * include/i386-signal.h (MAKE_THROW_FRAME): Ditto. * include/ppc-signal.h: New file. ->>>>>>> 1.385 2000-05-18 Bryce McKinlay <bryce@albatross.co.nz> * java/lang/Thread.java: Declare `data' as Object, not RawData. |