---------------------
PatchSet 8618 
Date: 2006/09/08 20:18:42
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fix merge conflict

Members: 
	lib/util.c:1.18.8.5->1.18.8.6 

Index: squid/lib/util.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/util.c,v
retrieving revision 1.18.8.5
retrieving revision 1.18.8.6
diff -u -r1.18.8.5 -r1.18.8.6
--- squid/lib/util.c	8 Sep 2006 20:13:37 -0000	1.18.8.5
+++ squid/lib/util.c	8 Sep 2006 20:18:42 -0000	1.18.8.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: util.c,v 1.18.8.5 2006/09/08 20:13:37 serassio Exp $
+ * $Id: util.c,v 1.18.8.6 2006/09/08 20:18:42 serassio Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived
@@ -33,19 +33,11 @@
  *
  */
 
-<<<<<<< util.c
-/* On native Windows, squid_mswin.h needs to know when we are compiling
- * util.c for the correct handling of FD<=>socket magic
- */  
-#define UTIL_C
-
-=======
 /* On native Windows, squid_mswin.h needs to know when we are compiling
  * util.c for the correct handling of FD<=>socket magic
  */
 #define UTIL_C
 
->>>>>>> 1.21
 #define _etext etext
 
 #include "config.h"