---------------------
PatchSet 9021 
Date: 2007/03/21 12:20:33
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge conflict

Members: 
	src/structs.h:1.81.2.43->1.81.2.44 

Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.81.2.43
retrieving revision 1.81.2.44
diff -u -r1.81.2.43 -r1.81.2.44
--- squid/src/structs.h	21 Mar 2007 11:23:06 -0000	1.81.2.43
+++ squid/src/structs.h	21 Mar 2007 12:20:33 -0000	1.81.2.44
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.81.2.43 2007/03/21 11:23:06 serassio Exp $
+ * $Id: structs.h,v 1.81.2.44 2007/03/21 12:20:33 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -882,11 +882,8 @@
 	unsigned int nodelay:1;
 	unsigned int close_on_exec:1;
 	unsigned int backoff:1;	/* keep track of whether the fd is backed off */
-<<<<<<< structs.h
 	unsigned int overlapped:1;
-=======
 	unsigned int dnsfailed:1;	/* did the dns lookup fail */
->>>>>>> 1.142
     } flags;
     comm_pending read_pending;
     comm_pending write_pending;