projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fad257c)
removed old conflict marker
authorTom Tromey <tromey@gcc.gnu.org>
Mon, 18 Sep 2006 17:10:36 +0000 (17:10 +0000)
committerTom Tromey <tromey@gcc.gnu.org>
Mon, 18 Sep 2006 17:10:36 +0000 (17:10 +0000)
From-SVN: r117030

libjava/ChangeLog patch | blob | history

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a4c80c9c3d25da3d95d425cd83a8918407045c50..8ad2f81c8b7bc17874acf5ddacc597ad9f0360cd 100644 (file)
--- 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: