diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-24 15:44:06 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-25 10:45:14 -0400 |
| commit | 044213c789c4f1ee214da3d70f02352b1aaa8673 (patch) | |
| tree | feb62ab035d27773f20be1e052a177c0c61299aa /src/lib/Bcfg2/Server/__init__.py | |
| parent | 0ff6b2788de683dd89203c7ae1393ea922a62c32 (diff) | |
| download | bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.tar.gz bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.tar.bz2 bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.zip | |
Fixing unit tests
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 |