Mercurial > hg > portage
comparison net-misc/ike/ike-2.2.1-r2.ebuild @ 437:061dcecdcd1e
resolved merge conflict
| author | Dirk Olmes <dirk@xanthippe.ping.de> |
|---|---|
| date | Mon, 20 Mar 2017 07:20:37 +0100 |
| parents | c46da1a0f7c2 |
| children | ab9e6592da92 |
comparison
equal
deleted
inserted
replaced
| 436:3360705cfae7 | 437:061dcecdcd1e |
|---|