OSDN Git Service

removed old conflict marker
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 18 Sep 2006 17:10:36 +0000 (17:10 +0000)
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 18 Sep 2006 17:10:36 +0000 (17:10 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117030 138bc75d-0d04-0410-961f-82ee72b054a4

libjava/ChangeLog

index a4c80c9..8ad2f81 100644 (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: