From 467216a618eb1e98180908ad1ed48f6862ecef30 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 26 Mar 2009 06:06:46 +0000
Subject: [PATCH] fix conflict

---
 configure.ac | 4 ----
 1 file changed, 4 deletions(-)

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
 
-- 
2.25.1