diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
| commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
| tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild | |
| parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
| parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) | |
gentoo resync : 28.09.2019
Diffstat (limited to 'media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild')
| -rw-r--r-- | media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild index 5fa946801729..ffdf966c2335 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild @@ -11,7 +11,11 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 else SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" +<<<<<<< HEAD KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +======= + KEYWORDS="~amd64 ~ppc ppc64 ~x86" +>>>>>>> next fi DESCRIPTION="Tools to create, alter, and inspect Matroska files" |