Fixed conflict from help system

c44e4f77 · Michel Pelletier · e6a3396b · c44e4f77
Commit c44e4f77 authored Jun 16, 2000 by Michel Pelletier
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

lib/python/Products/ZCatalog/ZCatalog.py lib/python/Products/ZCatalog/ZCatalog.py +0 -5

No files found.
--- a/lib/python/Products/ZCatalog/ZCatalog.py
+++ b/lib/python/Products/ZCatalog/ZCatalog.py
@@ -159,13 +159,8 @@ class ZCatalog(Folder, Persistent, Implicit):
         'help':('ZCatalog','ZCatalog_Indexes.stx')},
        {'label': 'Status', 'action': 'manage_catalogStatus', 
         'target':'manage_main',
-<<<<<<< ZCatalog.py
         'help':('ZCatalog','ZCatalog_Status.stx')},
-        )+Folder.manage_options
-=======
-         'help':('ZCatalog','ZCatalog_Status.dtml')},
        )
->>>>>>> 1.60

    __ac_permissions__=(