From a836b1710a95561b94fb35f21ee42eb5a8ef828b Mon Sep 17 00:00:00 2001
From: doug <doug@printer-g589.(none)>
Date: Wed, 02 Sep 2009 20:51:40 +0000
Subject: removed conflicted files

---
diff --git a/src/setup/__init__.py b/src/setup/__init__.py
deleted file mode 100644
index a003759..0000000
--- a/src/setup/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# this is a package
diff --git a/src/setup/level.py b/src/setup/level.py
deleted file mode 100644
index 5806830..0000000
--- a/src/setup/level.py
+++ /dev/null
@@ -1,32 +0,0 @@
-'''
-
-'''
-from lxml import etree  # using lxml for XML processing
-from utils import strs  # string constants
-from utils import utils # some XML utilities
-
-
-class Level(object):
-    '''
-    '''
-
-    def __init__(self, path):
-        '''Constructor'''
-        
-        #open up the mlvl file and read in its basic properties
-        root = utils.getXMLRoot(path)
-        self.name = root.xpath(strs.XP_LevelName)[0]
-        self.description = root.xpath(strs.XP_LevelName)[0]
-        self.path = path
-        pass
-    
-    def getName(self):
-        '''Returns the name of this level'''
-        return self.name
-    
-    def getDescription(self):
-        '''Returns the description of this level'''
-        return self.description    
-        
-        
-        
\ No newline at end of file
diff --git a/src/setup/main.py b/src/setup/main.py
deleted file mode 100644
index 82e5d18..0000000
--- a/src/setup/main.py
+++ /dev/null
@@ -1,22 +0,0 @@
-''''''
-
-#why?
-if __name__ == '__main__':
-    pass
-
-import sys
-sys.path.append('./src/')
-
-import menus
-from utils import strs
-
-# setup logging
-import logging
-logging.basicConfig(filename=strs.LoggingFile,level=logging.DEBUG)
-log = logging.getLogger('setup.main')
-
-# start the menus
-menus.begin()
-
-print( 'done' )
-
--
cgit v0.9.1