Index: openacs-4/packages/acs-core-docs/www/update-translations.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/update-translations.html,v diff -u -r1.13.2.2 -r1.13.2.3 --- openacs-4/packages/acs-core-docs/www/update-translations.html 12 Dec 2010 00:07:03 -0000 1.13.2.2 +++ openacs-4/packages/acs-core-docs/www/update-translations.html 12 Dec 2010 01:37:26 -0000 1.13.2.3 @@ -1,10 +1,5 @@ -<<<<<<< update-translations.html - -
Identify any new locales that have been created. -======= -
Identify any new locales that have been created. ->>>>>>> 1.15 +