Skip to content

R
riscv-gcc-1
Commit c2765075 by Bryce McKinlay
Options

Remove conflict indicator. 

From-SVN: r50893
parent 3bb65672
Showing with 0 additions and 1 deletions
libjava/ChangeLog
...@@ -106,7 +106,6 @@ ...@@ -106,7 +106,6 @@
* java/lang/natObject.cc: Move thread synchronization primitives to * java/lang/natObject.cc: Move thread synchronization primitives to
system-dependent headers. system-dependent headers.
>>>>>>> 1.1231
2002-03-09 Adam Megacz <adam@xwt.org> 2002-03-09 Adam Megacz <adam@xwt.org>
* java/io/natFileDescriptorWin32.cc (read): Return -1 if zero * java/io/natFileDescriptorWin32.cc (read): Return -1 if zero
......
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