diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
| commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
| tree | 76e74807bc479502e13866b581b6bf86734ec634 /media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild | |
| parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) | |
gentoo resync : 13.10.2019
Diffstat (limited to 'media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild')
| -rw-r--r-- | media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild index ffdf966c2335..ed4d29782167 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild @@ -11,11 +11,7 @@ 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 + KEYWORDS="amd64 ppc ppc64 x86" fi DESCRIPTION="Tools to create, alter, and inspect Matroska files" |