diff options
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" |