Remove ">>>"
From-SVN: r47472
This commit is contained in:
parent
9dd668d2fc
commit
fc6e87b33f
@ -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]:
|
||||
|
Loading…
Reference in New Issue
Block a user