summaryrefslogtreecommitdiff
path: root/sys-cluster/kubectl/kubectl-1.14.7.ebuild
diff options
context:
space:
mode:
Diffstat (limited to 'sys-cluster/kubectl/kubectl-1.14.7.ebuild')
-rw-r--r--sys-cluster/kubectl/kubectl-1.14.7.ebuild4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys-cluster/kubectl/kubectl-1.14.7.ebuild b/sys-cluster/kubectl/kubectl-1.14.7.ebuild
index 7a61b25dce90..eaf9590fedad 100644
--- a/sys-cluster/kubectl/kubectl-1.14.7.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.14.7.ebuild
@@ -6,7 +6,11 @@ inherit golang-build golang-vcs-snapshot bash-completion-r1
EGO_PN="k8s.io/kubernetes"
ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+<<<<<<< HEAD
KEYWORDS="~amd64"
+=======
+KEYWORDS="amd64"
+>>>>>>> next
DESCRIPTION="CLI to run commands against Kubernetes clusters"
HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"