Mercurial > hg > portage
diff net-im/mcabber/Manifest @ 437:061dcecdcd1e
resolved merge conflict
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Mon, 20 Mar 2017 07:20:37 +0100 |
parents | d130eab1967f |
children |
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Mon, 20 Mar 2017 07:20:37 +0100 |
parents | d130eab1967f |
children |