Commit fc6e87b3 by Bryce McKinlay

Remove ">>>"

From-SVN: r47472
parent 9dd668d2
......@@ -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]:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment