---------------------
PatchSet 2118 
Date: 2005/11/06 08:53:17
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge conflict

Members: 
	configure.in:1.26.2.72->1.26.2.73 

Index: squid3/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid3/configure.in,v
retrieving revision 1.26.2.72
retrieving revision 1.26.2.73
diff -u -r1.26.2.72 -r1.26.2.73
--- squid3/configure.in	6 Nov 2005 08:42:21 -0000	1.26.2.72
+++ squid3/configure.in	6 Nov 2005 08:53:17 -0000	1.26.2.73
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.26.2.72 2005/11/06 08:42:21 serassio Exp $
+dnl  $Id: configure.in,v 1.26.2.73 2005/11/06 08:53:17 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-NT-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.26.2.72 $)dnl
+AC_REVISION($Revision: 1.26.2.73 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -75,16 +75,8 @@
 		AC_DEFINE(HAVE_WIN32_PSAPI,1,[Define if you have PSAPI.DLL on Windows systems])
 		LIBS="$LIBS -lpsapi"
 	fi
-<<<<<<< configure.in
 	MINGW_LIBS="-lmingwex"
 	AC_SUBST(MINGW_LIBS)
-
-	;;
-*)
-=======
-	MINGW_LIBS="-lmingwex"
-	AC_SUBST(MINGW_LIBS)
->>>>>>> 1.85
 	;;
 esac