From abb2d1388c88da4e129eaf3208c592b9886ed81e Mon Sep 17 00:00:00 2001
From: bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 30 Nov 2001 03:05:09 +0000
Subject: Remove ">>>"

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

(limited to 'libjava')

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7c59b118d13..e75edf2dabe 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -49,7 +49,6 @@
 	* java/math/BigDecimal.java (BigDecimal(double)): Rewrote.
 	(BigDecimal(String)): Likewise.
 
->>>>>>> 1.1022
 2001-11-19  Tom Tromey  <tromey@redhat.com>
 
 	* verify.cc (_Jv_BytecodeVerifier::branch_prepass) [op_iinc]:
-- 
cgit v1.2.3