fix commit conflict
authorPaul Mangan <paul@claws-mail.org>
Mon, 18 Nov 2002 09:48:12 +0000 (09:48 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 18 Nov 2002 09:48:12 +0000 (09:48 +0000)
commit2916e7b1dc7f9902c939f758d58ce7649ec90f7f
tree527d194a2ca6eb10481f19e55ebbee82983fc74e
parentf550c460c306491e1f897a7895ede3c723462584
fix commit conflict
ChangeLog.claws
configure.in