From: Bryce McKinlay <bryce@gcc.gnu.org>
Date: Fri, 30 Nov 2001 03:05:09 +0000 (+0000)
Subject: Remove ">>>"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc6e87b33f1c961ded126986990048eb7120557a;p=gcc.git

Remove ">>>"

From-SVN: r47472
---

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]: