fixup

svn path=/main/trunk/; revision=2569

diff --git a/bin/emaint b/bin/emaint
index be538033dde61bd64aa9765b063fbd73e10e371d..803b5a72604d7c08940f7440a9566eeb0f202938 100755 (executable)
--- a/bin/emaint
+++ b/bin/emaint
@@ -49,7 +49,6 @@ class VdbKeyHandler(object):
                return "vdbkeys"
        name = staticmethod(name)
 
-<<<<<<< .mine
        def __init__(self):
                self.list = portage.db["/"]["vartree"].dbapi.cpv_all()
                self.missing = []
@@ -101,6 +100,7 @@ class VdbKeyHandler(object):
                                                        keyfile.close()
                
                return errors
+
 # this sucks, should track this in a different manner.
 modules = {"world" : WorldHandler,
                   "vdbkeys": VdbKeyHandler}