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 -r1.6.2.2 -r1.6.2.3 --- openacs-4/packages/acs-core-docs/www/tutorial-upgrade-scripts.html 12 Dec 2010 00:07:03 -0000 1.6.2.2 +++ openacs-4/packages/acs-core-docs/www/tutorial-upgrade-scripts.html 12 Dec 2010 01:37:26 -0000 1.6.2.3 @@ -1,10 +1,5 @@ -<<<<<<< tutorial-upgrade-scripts.html - -Writing upgrade scripts

Writing upgrade scripts

by Jade Rubick

-======= -Writing upgrade scripts

Writing upgrade scripts

by Jade Rubick

->>>>>>> 1.8 +Writing upgrade scripts

Writing upgrade scripts

by Jade Rubick

OpenACS docs are written by the named authors, and may be edited by OpenACS documentation staff.

If your package changes its data model, you have to write an