Fix mismerge, which partly undid ChrisM's move to DTMLFile.

lib/python/Products/ZCatalog/CatalogPathAwareness.py

@@ -101,7 +101,7 @@ class CatalogAware:
     meta_type='CatalogAware'
     default_catalog='Catalog'
 
-    manage_editCatalogerForm=HTMLFile('dtml/editCatalogerForm', globals())
+    manage_editCatalogerForm=DTMLFile('dtml/editCatalogerForm', globals())
 
     def manage_editCataloger(self, default, REQUEST=None):
         """ """