diff options
| author | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-28 11:26:42 +0000 |
|---|---|---|
| committer | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-28 11:26:42 +0000 |
| commit | 2a44ecc783d7dbbc2b96daa646ad4eadc66d39d6 (patch) | |
| tree | e7c0a9cb389fac28aff2d32e1c198fcd1dda1ae2 /libjava | |
| parent | bc802385bdfe5c271a6cdba14113c62ab3608c33 (diff) | |
| download | ppe42-gcc-2a44ecc783d7dbbc2b96daa646ad4eadc66d39d6.tar.gz ppe42-gcc-2a44ecc783d7dbbc2b96daa646ad4eadc66d39d6.zip | |
Removed extraneous conflict marker.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34754 138bc75d-0d04-0410-961f-82ee72b054a4
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 6c6bea8bf0a..a7b1a17fe10 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. |
