fix conflict
authorColin Leroy <colin@colino.net>
Thu, 21 Oct 2004 12:32:46 +0000 (12:32 +0000)
committerColin Leroy <colin@colino.net>
Thu, 21 Oct 2004 12:32:46 +0000 (12:32 +0000)
commitb308aea73154741eb716c34689df6e7d4e0d6d4c
treebb3c63c9db88f862720eccf1862c93b8035083b2
parent5789c83dddba5db15eb63afda212d12a64cde2c9
fix conflict
configure.ac