aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce McKinlay <bryce@gcc.gnu.org>2001-11-30 03:05:09 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2001-11-30 03:05:09 +0000
commitfc6e87b33f1c961ded126986990048eb7120557a (patch)
tree1b856097b10eb8e3098e15172f341dec84dcc47c
parent9dd668d2fc64b73f0645b120f249fd95b18e26c4 (diff)
downloadgcc-fc6e87b33f1c961ded126986990048eb7120557a.zip
gcc-fc6e87b33f1c961ded126986990048eb7120557a.tar.gz
gcc-fc6e87b33f1c961ded126986990048eb7120557a.tar.bz2
Remove ">>>"
From-SVN: r47472
-rw-r--r--libjava/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7c59b11..e75edf2 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]: