Index: openacs-4/packages/acs-core-docs/www/subsites-requirements.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/subsites-requirements.html,v diff -u -r1.30.2.1 -r1.30.2.2 --- openacs-4/packages/acs-core-docs/www/subsites-requirements.html 18 Jun 2010 21:29:36 -0000 1.30.2.1 +++ openacs-4/packages/acs-core-docs/www/subsites-requirements.html 12 Dec 2010 00:07:03 -0000 1.30.2.2 @@ -1,5 +1,10 @@ +<<<<<<< subsites-requirements.html