diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/__init__.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/__init__.py b/src/lib/Bcfg2/Server/__init__.py index 6bd0ff9eb..bf8d0191d 100644 --- a/src/lib/Bcfg2/Server/__init__.py +++ b/src/lib/Bcfg2/Server/__init__.py @@ -1,14 +1,6 @@ """This is the set of modules for Bcfg2.Server.""" import lxml.etree -from Bcfg2.Compat import walk_packages - -<<<<<<< HEAD -__all__ = ["Admin", "Core", "FileMonitor", "Plugin", "Plugins", - "Reports", "XMLParser", "XI", "XI_NAMESPACE"] -======= -__all__ = [m[1] for m in walk_packages(path=__path__)] ->>>>>>> maint XI = 'http://www.w3.org/2001/XInclude' XI_NAMESPACE = '{%s}' % XI |