app-crypt/libb2: remove merge-conflict messup
authorFabian Groffen <grobian@gentoo.org>
Wed, 5 Jun 2019 08:39:35 +0000 (10:39 +0200)
committerFabian Groffen <grobian@gentoo.org>
Wed, 5 Jun 2019 08:39:47 +0000 (10:39 +0200)
commita1b3692167ba367e37a8fb668c68c3d83c0e81aa
treeb800fb80c96e762dc40e5f1b4d7a7b682d84fadb
parent93acb0f0194d2d00d0109d079309d0ec65c94c9e
app-crypt/libb2: remove merge-conflict messup

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
app-crypt/libb2/libb2-0.98.1.ebuild