From 044213c789c4f1ee214da3d70f02352b1aaa8673 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 24 Apr 2013 15:44:06 -0400
Subject: Fixing unit tests

---
 src/lib/Bcfg2/Server/__init__.py | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'src/lib/Bcfg2/Server/__init__.py')

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
-- 
cgit v1.2.3-1-g7c22