From 743e05180b20cb1341a57d948fb9e7eaef5600d4 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 24 Aug 2009 10:05:03 +0000
Subject: [PATCH] conflicts are bad, and not valid python syntax

svn path=/main/branches/prefix/; revision=14149
---
 pym/_emerge/Binpkg.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py
index 35c38599e..73cd3712e 100644
--- a/pym/_emerge/Binpkg.py
+++ b/pym/_emerge/Binpkg.py
@@ -22,11 +22,8 @@ else:
 	sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 from portage.output import colorize
-<<<<<<< .working
 from portage.const import EPREFIX
-=======
 
->>>>>>> .merge-right.r13998
 class Binpkg(CompositeTask):
 
 	__slots__ = ("find_blockers",
-- 
2.26.2