From: Tom Tromey <tromey@gcc.gnu.org>
Date: Mon, 18 Sep 2006 17:10:36 +0000 (+0000)
Subject: removed old conflict marker
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97211077049068d8ff43e5e55627cf429ee0e869;p=gcc.git

removed old conflict marker

From-SVN: r117030
---

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: