---------------------
PatchSet 3677 
Date: 2006/09/03 16:52:56
Author: serassio
Branch: ipc
Tag: (none) 
Log:
Fix merge error

Members: 
	src/unlinkd.cc:1.8.2.4->1.8.2.5 

Index: squid3/src/unlinkd.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/unlinkd.cc,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- squid3/src/unlinkd.cc	3 Sep 2006 16:04:56 -0000	1.8.2.4
+++ squid3/src/unlinkd.cc	3 Sep 2006 16:52:56 -0000	1.8.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: unlinkd.cc,v 1.8.2.4 2006/09/03 16:04:56 serassio Exp $
+ * $Id: unlinkd.cc,v 1.8.2.5 2006/09/03 16:52:56 serassio Exp $
  *
  * DEBUG: section 2     Unlink Daemon
  * AUTHOR: Duane Wessels
@@ -224,9 +224,6 @@
 }
 #endif /* _SQUID_MSWIN_ */
 
-
-#endif
-
 void
 unlinkdInit(void)
 {