From ceffb799c13bb1147c61adc340b520067a90692d Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 18 Sep 2006 17:10:36 +0000
Subject: [PATCH] removed old conflict marker

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117030 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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:
-- 
2.11.4.GIT