---------------------
PatchSet 3287 
Date: 2006/06/13 20:26:19
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge error

Members: 
	src/cache_manager.cc:1.5.2.13->1.5.2.14 

Index: squid3/src/cache_manager.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/cache_manager.cc,v
retrieving revision 1.5.2.13
retrieving revision 1.5.2.14
diff -u -r1.5.2.13 -r1.5.2.14
--- squid3/src/cache_manager.cc	29 May 2006 17:04:05 -0000	1.5.2.13
+++ squid3/src/cache_manager.cc	13 Jun 2006 20:26:19 -0000	1.5.2.14
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_manager.cc,v 1.5.2.13 2006/05/29 17:04:05 serassio Exp $
+ * $Id: cache_manager.cc,v 1.5.2.14 2006/06/13 20:26:19 serassio Exp $
  *
  * DEBUG: section 16    Cache Manager Objects
  * AUTHOR: Duane Wessels
@@ -96,15 +96,6 @@
 }
 
 void
-cachemgrInit(void)
-{
-
-    cachemgrRegister("offline_toggle",
-                     "Toggle offline_mode setting",
-                     cachemgrOfflineToggle, 1, 1);
-}
-
-void
 CacheManager::registerAction(char const * action, char const * desc, OBJH * handler, int pw_req_flag, int atomic)
 {
     CacheManagerAction *a;