Index: openacs-4/packages/acs-core-docs/www/parties.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/parties.html,v diff -u -N -r1.47.2.2 -r1.47.2.3 --- openacs-4/packages/acs-core-docs/www/parties.html 12 Dec 2010 00:07:02 -0000 1.47.2.2 +++ openacs-4/packages/acs-core-docs/www/parties.html 12 Dec 2010 01:37:25 -0000 1.47.2.3 @@ -1,10 +1,5 @@ -<<<<<<< parties.html - -Parties in OpenACS

Parties in OpenACS

By Rafael H. Schloming

-======= -Parties in OpenACS

Parties in OpenACS

By Rafael H. Schloming

->>>>>>> 1.49 +Parties in OpenACS

Parties in OpenACS

By Rafael H. Schloming

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

Introduction

While many applications must deal with individuals and many applications @@ -350,8 +345,4 @@ single integer primary key in what could be thought of as a pure relation. Because a membership relation is an ordinary acs object with object identity, it is as easy to extend the membership relation to store extra information as it is to extend the users -<<<<<<< parties.html table or the groups table.

($Id$)
View comments on this page at openacs.org
-======= -table or the groups table.

($Id$)
View comments on this page at openacs.org
->>>>>>> 1.49