---------------------
PatchSet 475 
Date: 2000/07/31 21:57:53
Author: hno
Branch: ntlm
Tag: (none) 
Log:
Oops.. there was a minor merge conflict...

Members: 
	include/version.h:1.1.1.3.4.1.2.3->1.1.1.3.4.1.2.4 

Index: squid/include/version.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/version.h,v
retrieving revision 1.1.1.3.4.1.2.3
retrieving revision 1.1.1.3.4.1.2.4
diff -u -r1.1.1.3.4.1.2.3 -r1.1.1.3.4.1.2.4
--- squid/include/version.h	31 Jul 2000 21:56:42 -0000	1.1.1.3.4.1.2.3
+++ squid/include/version.h	31 Jul 2000 21:57:53 -0000	1.1.1.3.4.1.2.4
@@ -1,14 +1,10 @@
 /*
- * $Id: version.h,v 1.1.1.3.4.1.2.3 2000/07/31 21:56:42 hno Exp $
+ * $Id: version.h,v 1.1.1.3.4.1.2.4 2000/07/31 21:57:53 hno Exp $
  *
  *  SQUID_VERSION - String for version id of this distribution
  */
 #ifndef SQUID_VERSION
-<<<<<<< version.h
-#define SQUID_VERSION	"2.4.DEVEL3-ntlm"
-=======
-#define SQUID_VERSION	"2.4.DEVEL4"
->>>>>>> 1.1.1.4.2.2
+#define SQUID_VERSION	"2.4.DEVEL4-ntlm"
 #endif
 
 #ifndef SQUID_RELEASE_TIME