Remove conflict indicator.
authorBryce McKinlay <bryce@gcc.gnu.org>
Sat, 16 Mar 2002 21:04:28 +0000 (21:04 +0000)
committerBryce McKinlay <bryce@gcc.gnu.org>
Sat, 16 Mar 2002 21:04:28 +0000 (21:04 +0000)
commitc2765075dbaf9350c3a37c68d634fd24c43b94a9
tree4fd7ffd4011ab0b3250e2fb811ee2fc720b4eeff
parent3bb656728597694f7b2ea7d9c72787fe0800cc96
Remove conflict indicator.

From-SVN: r50893
libjava/ChangeLog