net-p2p/amule: Resolve merge conflicts.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 22 Jan 2016 10:39:32 +0000 (10:39 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 22 Jan 2016 10:39:32 +0000 (10:39 +0000)
commit1c48f49cea102f0d494f7d2f25c653317cf5c657
treef815ed63d934f2f8505bdd2a76b75a85ffe9a41a
parent5e0dabb435337913ced9d92b3f9ff5ee0fff9967
parent41f25eb21b8f14a516847ab494208539fec6ec8d
net-p2p/amule: Resolve merge conflicts.