Index: openacs-4/packages/acs-core-docs/www/tutorial-upgrade-scripts.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-upgrade-scripts.html,v diff -u -N -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/acs-core-docs/www/tutorial-upgrade-scripts.html 18 Jun 2010 21:29:36 -0000 1.6.2.1 +++ openacs-4/packages/acs-core-docs/www/tutorial-upgrade-scripts.html 12 Dec 2010 00:07:03 -0000 1.6.2.2 @@ -1,5 +1,10 @@ +<<<<<<< tutorial-upgrade-scripts.html