Index: openacs-4/packages/acs-core-docs/www/releasing-openacs.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/releasing-openacs.html,v diff -u -r1.25.2.1 -r1.25.2.2 --- openacs-4/packages/acs-core-docs/www/releasing-openacs.html 18 Jun 2010 21:29:35 -0000 1.25.2.1 +++ openacs-4/packages/acs-core-docs/www/releasing-openacs.html 12 Dec 2010 00:07:02 -0000 1.25.2.2 @@ -1,2 +1,7 @@ +<<<<<<< releasing-openacs.html Chapter 16. Releasing OpenACS

Chapter 16. Releasing OpenACS

Table of Contents

OpenACS Core and .LRN
How to Update the OpenACS.org repository
How to package and release an OpenACS Package
How to Update the translations
View comments on this page at openacs.org
+======= + +Chapter 15. Releasing OpenACS

Chapter 15. Releasing OpenACS

Table of Contents

OpenACS Core and .LRN
How to Update the OpenACS.org repository
How to package and release an OpenACS Package
How to Update the translations
View comments on this page at openacs.org
+>>>>>>> 1.27