OSDN Git Service

* ChangeLog: Remove conflict indicator.
authorfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 3 May 2005 23:53:58 +0000 (23:53 +0000)
committerfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 3 May 2005 23:53:58 +0000 (23:53 +0000)
commit42f0fe09d51a0dd48bdcd999406c69063c6f3bc5
tree5dd69889f3122f76038375891d300ee0e48aa3f7
parent43efdf10a782c76515e45996fbaddf272af44bc2
* ChangeLog: Remove conflict indicator.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99197 138bc75d-0d04-0410-961f-82ee72b054a4
libjava/ChangeLog