remove conflict marker...
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Mon, 9 Jul 2001 16:22:16 +0000 (16:22 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Mon, 9 Jul 2001 16:22:16 +0000 (16:22 +0000)
commit75dc11e42fbb9dcfbcdfe461620b7e4cb447b5b1
tree9da6438d19407a3b0e9ba70fed41e1292407597c
parentafab32835812e1d3e210a448e5399c90e138ae52
remove conflict marker...
ChangeLog.claws