---------------------
PatchSet 6679 
Date: 2005/05/21 09:45:36
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Fixed a merge error

Members: 
	doc/Makefile.am:1.1.2.1.4.6->1.1.2.1.4.7 

Index: squid/doc/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/doc/Makefile.am,v
retrieving revision 1.1.2.1.4.6
retrieving revision 1.1.2.1.4.7
diff -u -r1.1.2.1.4.6 -r1.1.2.1.4.7
--- squid/doc/Makefile.am	20 May 2005 08:41:50 -0000	1.1.2.1.4.6
+++ squid/doc/Makefile.am	21 May 2005 09:45:36 -0000	1.1.2.1.4.7
@@ -31,7 +31,6 @@
 EXTRA_DIST = \
 	squid.8.in \
 	cachemgr.cgi.8.in \
-	cachemgr.cgi.8 \
 	debug-sections.txt \
 	win32-relnotes.html