From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:19:36 +0100 Subject: gentoo resync : 13.10.2019 --- app-misc/tmux/tmux-2.9a.ebuild | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'app-misc/tmux/tmux-2.9a.ebuild') diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild index 4fa0176a67ac..9a6980c0acfe 100644 --- a/app-misc/tmux/tmux-2.9a.ebuild +++ b/app-misc/tmux/tmux-2.9a.ebuild @@ -14,11 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then else SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz" [[ "${PV}" == *_rc* ]] || \ -<<<<<<< HEAD - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -======= - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" ->>>>>>> next + KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" S="${WORKDIR}/${P/_/-}" fi -- cgit v1.2.3