[Zope-Checkins] CVS: Zope/lib/python/StructuredText - DocumentClass.py:1.22.2.12

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/StructuredText
In directory cvs.zope.org:/tmp/cvs-serv11931

Modified Files:
      Tag: Zope-2_4-branch
	DocumentClass.py 
Log Message:
uhhhhhhhh.....CVS had a minor merge problem


=== Zope/lib/python/StructuredText/DocumentClass.py 1.22.2.11 => 1.22.2.12 ===
         'doc_strong',
         'doc_emphasize',
-        'doc_underline',
         'doc_literal',
         'doc_underline',
         'doc_sgml',