---------------------
PatchSet 7951 
Date: 2006/05/24 21:18:16
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge conflict

Members: 
	src/win32.c:1.7.8.8->1.7.8.9 

Index: squid/src/win32.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/win32.c,v
retrieving revision 1.7.8.8
retrieving revision 1.7.8.9
diff -u -r1.7.8.8 -r1.7.8.9
--- squid/src/win32.c	24 May 2006 20:55:53 -0000	1.7.8.8
+++ squid/src/win32.c	24 May 2006 21:18:16 -0000	1.7.8.9
@@ -748,7 +748,6 @@
 	}
     } else {
 	WIN32_run_mode = _WIN_SQUID_RUN_MODE_INTERACTIVE;
-<<<<<<< win32.c
 #ifdef _SQUID_MSWIN_
 	opt_no_daemon = 1;
 #endif
@@ -850,12 +849,6 @@
 	    return -1;
 	}
 	CloseHandle(hProcess);
-=======
-#ifdef _SQUID_MSWIN_
-	opt_no_daemon = 1;
-#endif
-	return SquidMain(argc, argv);
->>>>>>> 1.10
     }
 #endif
     return 0;