FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed old conflict marker

Browse source 
From-SVN: r117030
This commit is contained in:
Tom Tromey 2006-09-18 17:10:36 +00:00
parent fad257c316
commit 9721107704
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

@ -98,7 +98,6 @@
* jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter.
Pass millis to _Jv_CondWait.
>>>>>>> .r116849
2006-08-31 Tom Tromey <tromey@redhat.com>
PR libgcj/28698: