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 @@
f
-=======
-
->>>>>>> 1.83.2.3
OpenACS
Subsite
2006-11-19
@@ -19,21 +16,12 @@
GPL
3
-<<<<<<< acs-subsite.info
-=======
-
-
-
-
-
-
->>>>>>> 1.83.2.3