diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-09-18 17:10:36 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-09-18 17:10:36 +0000 |
| commit | ceffb799c13bb1147c61adc340b520067a90692d (patch) | |
| tree | e36f0cb17307e5a93e1cbf4e262b2fe276e59079 /libjava/ChangeLog | |
| parent | fc0f602ce3f805018e8f1b96e47343df0e39e9e3 (diff) | |
| download | ppe42-gcc-ceffb799c13bb1147c61adc340b520067a90692d.tar.gz ppe42-gcc-ceffb799c13bb1147c61adc340b520067a90692d.zip | |
removed old conflict marker
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117030 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/ChangeLog')
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a4c80c9c3d2..8ad2f81c8b7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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: |
