* ChangeLog: Remove conflict indicator.
authorThomas Fitzsimmons <fitzsim@gcc.gnu.org>
Tue, 3 May 2005 23:53:58 +0000 (23:53 +0000)
committerThomas Fitzsimmons <fitzsim@gcc.gnu.org>
Tue, 3 May 2005 23:53:58 +0000 (23:53 +0000)
commit1d1fafea50e57058ee5e7ccdb93ee7656a5944d8
tree5dd69889f3122f76038375891d300ee0e48aa3f7
parent9247d229f65bc56a6fc285e0341eff74a830af76
* ChangeLog: Remove conflict indicator.

From-SVN: r99197
libjava/ChangeLog