Index: openacs-4/packages/acs-core-docs/www/style-guide.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/style-guide.html,v diff -u -r1.24.2.2 -r1.24.2.3 --- openacs-4/packages/acs-core-docs/www/style-guide.html 12 Dec 2010 00:07:03 -0000 1.24.2.2 +++ openacs-4/packages/acs-core-docs/www/style-guide.html 12 Dec 2010 01:37:25 -0000 1.24.2.3 @@ -1,10 +1,5 @@ -<<<<<<< style-guide.html - -
-======= -
->>>>>>> 1.26 +
By Jeff Davis