Index: openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml,v
diff -u -r1.27.2.1 -r1.27.2.2
--- openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml	18 Jun 2010 21:29:36 -0000	1.27.2.1
+++ openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml	12 Dec 2010 00:07:03 -0000	1.27.2.2
@@ -537,7 +537,11 @@
 
 
 
+<<<<<<< release-notes.xml
   <para><phrase role="cvstag">($Id$)</phrase></para>
+=======
+  <para><phrase role="cvstag">($Id$)</phrase></para>
+>>>>>>> 1.28
   </sect2>