conflicts are bad, and not valid python syntax

svn path=/main/branches/prefix/; revision=14149

diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py
index 35c38599e92a5d1d70a05784f5a1614991fe4635..73cd3712e521fa21bafcf21c24da59ebb6c23545 100644 (file)
--- 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",