remove conflict line in changelog
authorThomas Vander Stichele <thomas@apestaart.org>
Mon, 8 Mar 2004 09:20:31 +0000 (09:20 +0000)
committerThomas Vander Stichele <thomas@apestaart.org>
Mon, 8 Mar 2004 09:20:31 +0000 (09:20 +0000)
commitcd56f878ff313a16210e44af9006b3fd12bad577
tree8d7d4614109dbf988dae28e80462ba4479840413
parent9b3eb417bda9e06a6e375bd9fa4f3c46bf4203f3
remove conflict line in changelog

Original commit message from CVS:
remove conflict line in changelog
ChangeLog