fix conflict
authorPaul Mangan <paul@claws-mail.org>
Thu, 26 Mar 2009 06:06:46 +0000 (06:06 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 26 Mar 2009 06:06:46 +0000 (06:06 +0000)
commit467216a618eb1e98180908ad1ed48f6862ecef30
tree35040a2d74da403a354c7ef4708d42314c44e073
parent483b9bab50095776d0a3a3565871e27d59fcf23c
fix conflict
configure.ac