diff options
Diffstat (limited to 'app-arch/lz4/lz4-1.9.2.ebuild')
-rw-r--r-- | app-arch/lz4/lz4-1.9.2.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild index be2f0a379c20..d0dfbdbe0e15 100644 --- a/app-arch/lz4/lz4-1.9.2.ebuild +++ b/app-arch/lz4/lz4-1.9.2.ebuild @@ -11,7 +11,11 @@ if [[ ${PV} == 9999 ]]; then EGIT_BRANCH=dev else SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz" +<<<<<<< HEAD KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +======= + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +>>>>>>> next fi DESCRIPTION="Extremely Fast Compression algorithm" |