Index: openacs-4/packages/acs-core-docs/www/update-repository.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/update-repository.html,v diff -u -r1.14.2.2 -r1.14.2.3 --- openacs-4/packages/acs-core-docs/www/update-repository.html 12 Dec 2010 00:07:03 -0000 1.14.2.2 +++ openacs-4/packages/acs-core-docs/www/update-repository.html 12 Dec 2010 01:37:26 -0000 1.14.2.3 @@ -1,10 +1,5 @@ -<<<<<<< update-repository.html - -How to Update the OpenACS.org repository

How to Update the OpenACS.org repository

  1. -======= -How to Update the OpenACS.org repository

    How to Update the OpenACS.org repository

    1. ->>>>>>> 1.16 +How to Update the OpenACS.org repository

      How to Update the OpenACS.org repository

      1. Setup a local OpenACS server running 5.0 or better.

      2. Edit packages/acs-admin/www/apm/build-repository.tcl and adjust the Configuration Settings.