From b28e96561e17281937ca62c1f904f8ef3f64d54e Mon Sep 17 00:00:00 2001
From: Marius Mauch <genone@gentoo.org>
Date: Sun, 22 Jan 2006 21:26:19 +0000
Subject: fixup

svn path=/main/trunk/; revision=2569
---
 bin/emaint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/emaint')

diff --git a/bin/emaint b/bin/emaint
index be538033d..803b5a726 100755
--- 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}
-- 
cgit v1.2.3-1-g7c22