---------------------
PatchSet 2923 
Date: 2006/04/29 16:02:59
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge error

Members: 
	helpers/digest_auth/ldap/config.test:1.1.2.5->1.1.2.6 
	helpers/external_acl/ldap_group/config.test:1.1.2.5->1.1.2.6 

Index: squid3/helpers/digest_auth/ldap/config.test
===================================================================
RCS file: /cvsroot/squid-sf//squid3/helpers/digest_auth/ldap/config.test,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- squid3/helpers/digest_auth/ldap/config.test	25 Apr 2006 09:52:31 -0000	1.1.2.5
+++ squid3/helpers/digest_auth/ldap/config.test	29 Apr 2006 16:02:59 -0000	1.1.2.6
@@ -5,7 +5,4 @@
 if [ -f /usr/include/winldap.h ]; then
 	exit 0
 fi
-if [ -f /usr/include/winldap.h ]; then
-	exit 0
-fi
 exit 1
Index: squid3/helpers/external_acl/ldap_group/config.test
===================================================================
RCS file: /cvsroot/squid-sf//squid3/helpers/external_acl/ldap_group/config.test,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- squid3/helpers/external_acl/ldap_group/config.test	25 Apr 2006 09:52:31 -0000	1.1.2.5
+++ squid3/helpers/external_acl/ldap_group/config.test	29 Apr 2006 16:02:59 -0000	1.1.2.6
@@ -5,7 +5,4 @@
 if [ -f /usr/include/winldap.h ]; then
 	exit 0
 fi
-if [ -f /usr/include/winldap.h ]; then
-	exit 0
-fi
 exit 1