---------------------
PatchSet 252 
Date: 2000/05/02 23:04:11
Author: hno
Branch: hno-devel
Tag: (none) 
Log:
Fixed a forgotten merge conflict

Members: 
	configure.in:1.1.1.3.6.7.2.3->1.1.1.3.6.7.2.4 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.1.1.3.6.7.2.3
retrieving revision 1.1.1.3.6.7.2.4
diff -u -r1.1.1.3.6.7.2.3 -r1.1.1.3.6.7.2.4
--- squid/configure.in	2 May 2000 22:50:27 -0000	1.1.1.3.6.7.2.3
+++ squid/configure.in	2 May 2000 23:04:11 -0000	1.1.1.3.6.7.2.4
@@ -3,13 +3,13 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.1.1.3.6.7.2.3 2000/05/02 22:50:27 hno Exp $
+dnl  $Id: configure.in,v 1.1.1.3.6.7.2.4 2000/05/02 23:04:11 hno Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.1.1.3.6.7.2.3 $)dnl
+AC_REVISION($Revision: 1.1.1.3.6.7.2.4 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -1561,13 +1561,8 @@
 	./auth_modules/Makefile \
 	./auth_modules/NCSA/Makefile \
 	./auth_modules/PAM/Makefile \
-<<<<<<< configure.in
-	./auth_modules/SMB/Makefile
-	./auth_modules/MSNT/Makefile
-=======
 	./auth_modules/SMB/Makefile \
 	./auth_modules/MSNT/Makefile \
->>>>>>> 1.1.1.3.2.12
 	./auth_modules/getpwnam/Makefile \
 	./auth_modules/LDAP/Makefile \
 )