Skip to content

R
riscv-gcc-1
Commit 97211077 by Tom Tromey
Options

removed old conflict marker 

From-SVN: r117030
parent fad257c3
Showing with 0 additions and 1 deletions
libjava/ChangeLog
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
* jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter. * jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter.
Pass millis to _Jv_CondWait. Pass millis to _Jv_CondWait.
>>>>>>> .r116849
2006-08-31 Tom Tromey <tromey@redhat.com> 2006-08-31 Tom Tromey <tromey@redhat.com>
PR libgcj/28698: PR libgcj/28698:
......
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