Resolve merge conflict... CVS at least would have warned about it...
authorFabian Groffen <grobian@gentoo.org>
Tue, 23 Feb 2010 17:14:10 +0000 (17:14 -0000)
committerFabian Groffen <grobian@gentoo.org>
Tue, 23 Feb 2010 17:14:10 +0000 (17:14 -0000)
commit085d817bc7bd28aaf0929879cbba97ff291133df
tree9303979434cc4b97df03d3f54b92e3ecb064d18b
parent4c1d25eb8c40d05d1da0cf6da9f0b73e57fa63e1
Resolve merge conflict... CVS at least would have warned about it...

svn path=/main/branches/prefix/; revision=15439
pym/portage/__init__.py
pym/portage/package/ebuild/fetch.py