Index: openacs-4/packages/acs-core-docs/www/ix01.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/ix01.html,v
diff -u -N -r1.25.2.1 -r1.25.2.2
--- openacs-4/packages/acs-core-docs/www/ix01.html 18 Jun 2010 21:29:35 -0000 1.25.2.1
+++ openacs-4/packages/acs-core-docs/www/ix01.html 12 Dec 2010 00:07:02 -0000 1.25.2.2
@@ -1,3 +1,9 @@
+<<<<<<< ix01.html
IndexS
- sect1, Headlines, Sections
- sect2, Headlines, Sections
- Sections
- Headlines, Headlines, Sections
- security
- definition, Install Red Hat 8/9
- firewall, Install Red Hat 8/9
- sendmail
- removing, Install qmail (OPTIONAL)
- ssh, Install Red Hat 8/9
View comments on this page at openacs.org
+=======
+
+IndexS
- sect1, Headlines, Sections
- sect2, Headlines, Sections
- Sections
- Headlines, Headlines, Sections
- security
- definition, Install Red Hat 8/9
- firewall, Install Red Hat 8/9
- sendmail
- removing, Install qmail (OPTIONAL)
- ssh, Install Red Hat 8/9
View comments on this page at openacs.org
+>>>>>>> 1.27