Resolved merge conflicts.

030628e5 · Jim Fulton · 4857a055 · 030628e5
Commit 030628e5 authored Sep 10, 1997 by Jim Fulton
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

lib/python/OFS/Document.py lib/python/OFS/Document.py +2 -4

No files found.
--- a/lib/python/OFS/Document.py
+++ b/lib/python/OFS/Document.py
 """Document object"""
-__version__='$Revision: 1.12 $'[11:-2]
+__version__='$Revision: 1.13 $'[11:-2]
 from Globals import HTML
 from Globals import HTMLFile
@@ -18,9 +18,7 @@ class Document(HTML, RoleManager):
    meta_type  ='Document'
    title=''
    icon       ='OFS/Document_icon.gif'
-    manage_options=()
    __state_names__=HTML.__state_names__+('title','__roles__')
    _formhead="""