ChangeLog: Remove cvs conflict marker.
authorStefan Kost <ensonic@users.sourceforge.net>
Wed, 25 Jun 2008 14:27:37 +0000 (14:27 +0000)
committerStefan Kost <ensonic@users.sourceforge.net>
Wed, 25 Jun 2008 14:27:37 +0000 (14:27 +0000)
commit954ddd96452d19a2302595f45c8d6f8cd486741a
treeb7df721fd099011d923a840231f33cad712a6550
parentbc82d5536cd53c5615b4e355ec1005549208cf25
ChangeLog: Remove cvs conflict marker.

Original commit message from CVS:
* ChangeLog:
Remove cvs conflict marker.
ChangeLog