OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed extraneous conflict marker. 

From-SVN: r34754
This commit is contained in:
Warren Levy 2000-06-28 11:26:42 +00:00
parent 2017da526c
commit 580ac50392
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libjava/ChangeLog
View File

@ -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.