X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=configure.ac;h=94e2e84e16fc4f67b46c13d32c56c6a759b00cc6;hp=fb7f1849e01792d8387736c8f6f96b129a05a56f;hb=467216a618eb1e98180908ad1ed48f6862ecef30;hpb=483b9bab50095776d0a3a3565871e27d59fcf23c

diff --git a/configure.ac b/configure.ac
index fb7f1849e..94e2e84e1 100644
--- 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