---------------------
PatchSet 6655 
Date: 2005/05/03 09:53:58
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Fixed merge error

Members: 
	doc/Makefile.am:1.1.2.1.4.3->1.1.2.1.4.4 

Index: squid/doc/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/doc/Makefile.am,v
retrieving revision 1.1.2.1.4.3
retrieving revision 1.1.2.1.4.4
diff -u -r1.1.2.1.4.3 -r1.1.2.1.4.4
--- squid/doc/Makefile.am	27 Apr 2005 18:43:08 -0000	1.1.2.1.4.3
+++ squid/doc/Makefile.am	3 May 2005 09:53:58 -0000	1.1.2.1.4.4
@@ -31,10 +31,9 @@
 EXTRA_DIST = \
 	squid.8.in \
 	cachemgr.cgi.8.in \
-	debug-sections.txt
-
-CLEANFILES = \
-	squid.8 \
 	cachemgr.cgi.8 \
 	debug-sections.txt \
 	win32-relnotes.html
+
+CLEANFILES = \
+	squid.8 \