Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.84 -r1.85
--- openacs-4/packages/acs-subsite/acs-subsite.info	11 Dec 2006 17:49:14 -0000	1.84
+++ openacs-4/packages/acs-subsite/acs-subsite.info	15 Dec 2006 00:01:49 -0000	1.85
@@ -8,20 +8,32 @@
     <singleton-p>f</singleton-p>
     
     <version name="5.4.0d1" url="http://openacs.org/repository/download/apm/acs-subsite-5.4.0d1.apm">
+=======
+    <version name="5.3.0b1" url="http://openacs.org/repository/download/apm/acs-subsite-5.3.0b1.apm">
+>>>>>>> 1.83.2.3
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
-        <release-date>2006-06-04</release-date>
+        <release-date>2006-11-19</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">Provides for creating subsites within the OpenACS Community System.  Aware of parties, groups, users, portraits.  Can be themed via a per subsite master template.</description>
         <license>GPL</license>
         <maturity>3</maturity>
 
+<<<<<<< acs-subsite.info
         <provides url="acs-subsite" version="5.4.0d1"/>
         <requires url="acs-authentication" version="5.3.0d1"/>
         <requires url="acs-content-repository" version="5.3.0d1"/>
         <requires url="acs-kernel" version="5.3.0d1"/>
         <requires url="acs-tcl" version="5.3.0d1"/>
         <requires url="acs-lang" version="5.3.0d1"/>
+=======
+        <provides url="acs-subsite" version="5.3.0b1"/>
+        <requires url="acs-authentication" version="5.3.0b1"/>
+        <requires url="acs-content-repository" version="5.3.0b1"/>
+        <requires url="acs-kernel" version="5.3.0b1"/>
+        <requires url="acs-tcl" version="5.3.0b1"/>
+        <requires url="acs-lang" version="5.3.0b1"/>
+>>>>>>> 1.83.2.3
 
         <callbacks>
             <callback type="after-install"  proc="subsite::package_install"/>
@@ -53,6 +65,7 @@
 3 - Show user email as an image (require ImageMagick). If ImageMagick not present then the @ symbol is replaced with an image.
 2 - Hide email, show a link that allows users to send a message.
 1 -  Shows nothing." section_name="user-info"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegImplNamet"  default="asm_url" description="Name of the implementation used in the registration process." section_name="user-login"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="RegistrationId"  default="0" description="Assessment_id for the assessment used in the registration process. If value = 0 the current registration form will be used." section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationImplName"  default="null" description="Name of the implementation used for the registration process. If value is null, the normal registration process will be used and the RegisterId parameter will be ignored." section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationProvidesRandomPasswordP"  default="0" description="have the system generate a random password instead of the user" section_name="user-login"/>