diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-11-30 03:05:09 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-11-30 03:05:09 +0000 |
| commit | abb2d1388c88da4e129eaf3208c592b9886ed81e (patch) | |
| tree | 1b856097b10eb8e3098e15172f341dec84dcc47c /libjava/ChangeLog | |
| parent | 1a5eacbb53db655b3b1e82d9597cdd623aeacebe (diff) | |
| download | gcc-abb2d1388c88da4e129eaf3208c592b9886ed81e.tar.gz | |
Remove ">>>"
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@47472 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/ChangeLog')
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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]: |