Index: openacs-4/packages/wp-slim/tcl/wp-slim-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/tcl/wp-slim-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/tcl/wp-slim-procs.tcl	13 Jun 2005 16:32:48 -0000	1.3
+++ openacs-4/packages/wp-slim/tcl/wp-slim-procs.tcl	15 Jun 2005 18:03:36 -0000	1.4
@@ -3,42 +3,6 @@
    Wimpy procs
 }
 
-namespace eval wp::merge {
-
-    ad_proc -callback MergeShowUserInfo -impl wp-slim {
-	-user_id:required
-    } {
-	Merge the wp items of two users.
-    } {
-	set msg "Wimpty point items of $user_id"
-	set result [list $msg]
-
-	set styles [db_list_of_lists sel_wp_styles { *SQL* } ] 
-	
-	lappend result "Styles of $user_id: $styles"
-	
-	return $result
-    }
-
-    ad_proc -callback MergePackageUser -impl wp-slim {
-	-from_user_id:required
-	-to_user_id:required
-    } {
-	Merge the wp items of two users.
-    } {
-	set msg "Merging wp-slim "
-	ns_log Notice $msg
-	set result [list $msg]
-
-	db_dml upd_wp_styles  { *SQL* }
-	
-	lappend result "Merge of wp-slim is done"
-	
-	return $result
-    }
-}
-
-
 ad_proc wp_header {style_id} { Build the proper style for an specific page. } {
 
     db_1row get_style_data { *SQL* }
@@ -59,7 +23,6 @@
 	}
     }
     return $out
-
 }
 
 
Index: openacs-4/packages/wp-slim/tcl/wp-slim-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/tcl/wp-slim-procs.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/tcl/wp-slim-procs.xql	13 Jun 2005 16:32:48 -0000	1.3
+++ openacs-4/packages/wp-slim/tcl/wp-slim-procs.xql	15 Jun 2005 18:03:36 -0000	1.4
@@ -1,22 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
 
-  <fullquery name="callback::MergePackageUser::impl::wp-slim.upd_wp_styles">      
-    <querytext>
-      update wp_styles 
-      set owner = :to_user_id
-      where owner = :from_user_id
-    </querytext>
-  </fullquery>
-
-  <fullquery name="callback::MergeShowUserInfo::impl::wp-slim.sel_wp_styles">      
-    <querytext>
-      select style_id , name 
-      from wp_styles
-      where owner = :user_id
-    </querytext>
-  </fullquery>
-
   <fullquery name="wp_header.get_style_data">      
     <querytext>
 	select * from wp_styles where style_id = :style_id