commit: 1c48f49cea102f0d494f7d2f25c653317cf5c657 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Fri Jan 22 10:39:32 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Fri Jan 22 10:39:32 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c48f49c
net-p2p/amule: Resolve merge conflicts. net-p2p/amule/amule-2.3.1-r1.ebuild | 31 +++++++++++++------------------ net-p2p/amule/files/amuled.initd | 11 ++++++----- net-p2p/amule/files/amuleweb.initd | 13 +++++++------ 3 files changed, 26 insertions(+), 29 deletions(-)
