diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2006-09-18 17:10:36 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-09-18 17:10:36 +0000 |
| commit | 97211077049068d8ff43e5e55627cf429ee0e869 (patch) | |
| tree | e36f0cb17307e5a93e1cbf4e262b2fe276e59079 | |
| parent | fad257c3163ed5afdb38236a756d66c80539a9a1 (diff) | |
| download | gcc-97211077049068d8ff43e5e55627cf429ee0e869.zip gcc-97211077049068d8ff43e5e55627cf429ee0e869.tar.gz gcc-97211077049068d8ff43e5e55627cf429ee0e869.tar.bz2 | |
removed old conflict marker
From-SVN: r117030
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a4c80c9..8ad2f81 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: |