Index: openacs-4/packages/acs-core-docs/www/high-avail.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/high-avail.html,v diff -u -N -r1.20.2.1 -r1.20.2.2 --- openacs-4/packages/acs-core-docs/www/high-avail.html 18 Jun 2010 21:29:34 -0000 1.20.2.1 +++ openacs-4/packages/acs-core-docs/www/high-avail.html 12 Dec 2010 00:07:02 -0000 1.20.2.2 @@ -1,2 +1,7 @@ +<<<<<<< high-avail.html