remove conflict marker
authorFabian Groffen <grobian@gentoo.org>
Sat, 10 Dec 2011 12:06:09 +0000 (13:06 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sat, 10 Dec 2011 12:06:09 +0000 (13:06 +0100)
commit97ad87a656c26e93f3d4d51776dfb9e7533c7d25
tree81b91382792db46ac20a9e646830ef0ed9883584
parent28b58821c000fc413312cb44c85f6697a555625c
remove conflict marker
pym/portage/dispatch_conf.py