projects / claws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 483b9ba)
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)
configure.ac patch | blob | history

diff --git a/configure.ac b/configure.ac
index fb7f1849e01792d8387736c8f6f96b129a05a56f..94e2e84e16fc4f67b46c13d32c56c6a759b00cc6 100644 (file)
--- 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
 
Claws Mail