Index: openacs-4/packages/acs-core-docs/www/permissions-design.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/permissions-design.html,v diff -u -r1.30.2.2 -r1.30.2.3 --- openacs-4/packages/acs-core-docs/www/permissions-design.html 12 Dec 2010 00:07:02 -0000 1.30.2.2 +++ openacs-4/packages/acs-core-docs/www/permissions-design.html 12 Dec 2010 01:37:25 -0000 1.30.2.3 @@ -1,10 +1,5 @@ -<<<<<<< permissions-design.html - -Permissions Design
Alex logo
Prev Chapter 15. Kernel Documentation Next

Permissions Design

By John Prevost and Rafael H. Schloming

-======= -Permissions Design
Alex logo
Prev Chapter 14. Kernel Documentation Next

Permissions Design

By John Prevost and Rafael H. Schloming

->>>>>>> 1.32 +Permissions Design
Alex logo
Prev Chapter 15. Kernel Documentation Next

Permissions Design

By John Prevost and Rafael H. Schloming

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

Essentials