---------------------
PatchSet 7901 
Date: 2006/05/23 18:50:19
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge error

Members: 
	helpers/external_acl/ldap_group/squid_ldap_group.c:1.6.8.2->1.6.8.3 

Index: squid/helpers/external_acl/ldap_group/squid_ldap_group.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/ldap_group/squid_ldap_group.c,v
retrieving revision 1.6.8.2
retrieving revision 1.6.8.3
diff -u -r1.6.8.2 -r1.6.8.3
--- squid/helpers/external_acl/ldap_group/squid_ldap_group.c	22 May 2006 21:02:48 -0000	1.6.8.2
+++ squid/helpers/external_acl/ldap_group/squid_ldap_group.c	23 May 2006 18:50:19 -0000	1.6.8.3
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#ifdef _SQUID_MSWIN_ /* Native Windows port and MinGW */
+#ifdef _SQUID_MSWIN_		/* Native Windows port and MinGW */
 
 #define snprintf _snprintf
 #include <windows.h>