projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9dd668d)
Remove ">>>"
authorBryce McKinlay <bryce@gcc.gnu.org>
Fri, 30 Nov 2001 03:05:09 +0000 (03:05 +0000)
committerBryce McKinlay <bryce@gcc.gnu.org>
Fri, 30 Nov 2001 03:05:09 +0000 (03:05 +0000)
From-SVN: r47472

libjava/ChangeLog patch | blob | history

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7c59b118d1357eb6c7b2b529c50b729e0f1c7b09..e75edf2dabe6dead528a26b9b73267661cd2751a 100644 (file)
--- 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]: