comparison net-p2p/deluge/metadata.xml @ 437:061dcecdcd1e

resolved merge conflict
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 20 Mar 2017 07:20:37 +0100 (2017-03-20)
parents eb98558e684c
children
comparison
equal deleted inserted replaced
436:3360705cfae7 437:061dcecdcd1e