---------------------
PatchSet 715 
Date: 2003/04/27 10:30:47
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed a merge conflict

Members: 
	src/main.cc:1.15.2.15->1.15.2.16 

Index: squid3/src/main.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/main.cc,v
retrieving revision 1.15.2.15
retrieving revision 1.15.2.16
diff -u -r1.15.2.15 -r1.15.2.16
--- squid3/src/main.cc	27 Apr 2003 06:46:29 -0000	1.15.2.15
+++ squid3/src/main.cc	27 Apr 2003 10:30:47 -0000	1.15.2.16
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.15.2.15 2003/04/27 06:46:29 serassio Exp $
+ * $Id: main.cc,v 1.15.2.16 2003/04/27 10:30:47 serassio Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -218,12 +218,6 @@
             opt_reload_hit_only = 1;
 
             break;
-#if USE_WIN32_SERVICE
-
-        case 'i':
-            opt_install_service = TRUE;
-            break;
-#endif
 
 #if USE_WIN32_SERVICE