ChangeLog: Remove conflict marker from ChangeLog
authorJan Schmidt <thaytan@mad.scientist.com>
Wed, 31 Dec 2008 11:20:55 +0000 (11:20 +0000)
committerJan Schmidt <thaytan@mad.scientist.com>
Wed, 31 Dec 2008 11:20:55 +0000 (11:20 +0000)
commitf2c94d14683658514c236b38e9ed7ef557b7145f
treefe402ebcc2f480e61316ba4980395b3da7eb98c7
parentdc4240de34ada0476a2e456f35ba70a910cc84af
ChangeLog: Remove conflict marker from ChangeLog

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