net-p2p/amule: Resolve merge conflicts.
[gentoo.git] / dev-java / ant /
drwxr-xr-x   ..
-rw-r--r-- 2145 ant-1.9.2.ebuild
-rw-r--r-- 1076 metadata.xml