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.85 -r1.86
--- openacs-4/packages/acs-subsite/acs-subsite.info	15 Dec 2006 00:01:49 -0000	1.85
+++ openacs-4/packages/acs-subsite/acs-subsite.info	15 Dec 2006 00:09:29 -0000	1.86
@@ -8,9 +8,6 @@
     <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-11-19</release-date>
@@ -19,21 +16,12 @@
         <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"/>