Index: openacs-4/packages/acs-core-docs/www/tutorial-comments.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-comments.html,v diff -u -r1.11.2.2 -r1.11.2.3 --- openacs-4/packages/acs-core-docs/www/tutorial-comments.html 12 Dec 2010 00:07:03 -0000 1.11.2.2 +++ openacs-4/packages/acs-core-docs/www/tutorial-comments.html 12 Dec 2010 01:37:25 -0000 1.11.2.3 @@ -1,10 +1,5 @@ -<<<<<<< tutorial-comments.html - -Adding Comments

Adding Comments

You can track comments for any ACS Object. Here we'll track -======= -Adding Comments

Adding Comments

You can track comments for any ACS Object. Here we'll track ->>>>>>> 1.13 +Adding Comments

Adding Comments

You can track comments for any ACS Object. Here we'll track comments for notes. On the note-edit.tcl/adp pair, which is used to display individual notes, we want to put a link to add comments at the bottom of the screen. If there are any comments, we want to