ChangeLog: remove conflict markers
authorDavid Schleef <ds@schleef.org>
Tue, 11 Dec 2007 21:18:57 +0000 (21:18 +0000)
committerDavid Schleef <ds@schleef.org>
Tue, 11 Dec 2007 21:18:57 +0000 (21:18 +0000)
commitf6e42cd3d5cb1869f4c3b1a40cccea1d1621e760
treed51c5fe6d1037ed74911bc3a6b52b1f23469e273
parentfe67fbb1ffc8e628f348b8f4a05d3e9bd51b6b35
ChangeLog: remove conflict markers

Original commit message from CVS:
ChangeLog: remove conflict markers
ChangeLog