diff options
Diffstat (limited to 'app-misc/tmux/tmux-2.9a.ebuild')
| -rw-r--r-- | app-misc/tmux/tmux-2.9a.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild index 561221b38ce0..4fa0176a67ac 100644 --- a/app-misc/tmux/tmux-2.9a.ebuild +++ b/app-misc/tmux/tmux-2.9a.ebuild @@ -14,7 +14,11 @@ 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 S="${WORKDIR}/${P/_/-}" fi |