Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	12 May 2002 20:57:02 -0000	1.18
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	13 May 2002 02:11:10 -0000	1.19
@@ -844,19 +844,11 @@
 }
 
 
-<<<<<<< apm-procs.tcl
 ad_proc -public apm_package_instance_new {
     {-package_id 0}
     instance_name
     context_id
     package_key
-=======
-ad_proc -public apm_package_create_instance {
-    {
-	-package_id 0
-    }
-    instance_name context_id package_key
->>>>>>> 1.16.2.1
 } {
     Creates a new instance of a package.
 } {
@@ -900,19 +892,9 @@
 	}
     }
     
-<<<<<<< apm-procs.tcl
     return $package_id
 }
 
-ad_proc -public apm_package_instance_delete {
-    package_id
-} {
-    Deletes an instance of a package
-} {
-    db_exec_plsql apm_package_instance_delete {}
-=======
-}
-
 ad_proc -public apm_package_instance_new {
     {
 	-package_id 0
@@ -931,7 +913,6 @@
 } {
     set package_id [apm_package_create_instance -package_id $package_id $instance_name $context_id $package_key]
     apm_package_call_post_instantiation_proc $package_id $package_key
->>>>>>> 1.16.2.1
 }
 
 
@@ -956,3 +937,12 @@
 	ad_parameter_cache -set [lindex $name_value_pair 1] $package_id [lindex $name_value_pair 0]
     }
 }
+
+ad_proc -public apm_package_instance_delete {
+    package_id
+} {
+    Deletes an instance of a package
+} {
+    db_exec_plsql apm_package_instance_delete {}
+}
+