Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.1.5-5.2.0a1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/Attic/upgrade-5.1.5-5.2.0a1.sql,v
diff -u -N
--- openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.1.5-5.2.0a1.sql	4 Jun 2006 00:45:38 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
--- procedure merge
-create or replace function membership_rel__merge (integer)
-returns integer as '
-declare
-  merge__rel_id                alias for $1;  
-begin
-    update membership_rels
-    set member_state = ''merged''
-    where rel_id = merge__rel_id;
-
-    return 0; 
-end;' language 'plpgsql';
-
-
-alter table membership_rels drop constraint membership_rel_mem_ck;
-
-alter table membership_rels add constraint membership_rel_mem_ck check (member_state in ('approved','needs approval','banned','rejected','deleted','merged'));
\ No newline at end of file