Skip to content

R
riscv-gcc-1
Commit 580ac503 by Warren Levy
Options

Removed extraneous conflict marker. 

From-SVN: r34754
parent 2017da52
Showing with 0 additions and 1 deletions
libjava/ChangeLog
...@@ -674,7 +674,6 @@ ...@@ -674,7 +674,6 @@
* include/i386-signal.h (MAKE_THROW_FRAME): Ditto. * include/i386-signal.h (MAKE_THROW_FRAME): Ditto.
* include/ppc-signal.h: New file. * include/ppc-signal.h: New file.
>>>>>>> 1.385
2000-05-18 Bryce McKinlay <bryce@albatross.co.nz> 2000-05-18 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/Thread.java: Declare `data' as Object, not RawData. * java/lang/Thread.java: Declare `data' as Object, not RawData.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment