commit 467216a618eb1e98180908ad1ed48f6862ecef30 parent 483b9bab50095776d0a3a3565871e27d59fcf23c Author: Paul Mangan <paul@claws-mail.org> Date: Thu, 26 Mar 2009 06:06:46 +0000 fix conflict Diffstat:
| M | configure.ac | | | 4 | ---- |
1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac @@ -86,11 +86,7 @@ AM_PROG_LEX AC_PROG_YACC AC_LIB_PREFIX AC_LIBTOOL_WIN32_DLL -<<<<<<< configure.ac -dnl LT_AC_PROG_RC -======= LT_AC_PROG_RC ->>>>>>> 1.654.2.3832 AC_LIBTOOL_RC AC_PROG_LIBTOOL