conflicts are bad, and not valid python syntax
authorFabian Groffen <grobian@gentoo.org>
Mon, 24 Aug 2009 10:05:03 +0000 (10:05 -0000)
committerFabian Groffen <grobian@gentoo.org>
Mon, 24 Aug 2009 10:05:03 +0000 (10:05 -0000)
commit743e05180b20cb1341a57d948fb9e7eaef5600d4
tree36c7c7034c402d8c285f866053ff822f985b2876
parent0915a2a5ca0f2ec30160bcace8d5f3d26616af05
conflicts are bad, and not valid python syntax

svn path=/main/branches/prefix/; revision=14149
pym/_emerge/Binpkg.py