merge: main

This commit is contained in:
AngeD 2022-12-13 10:44:27 +01:00
commit 0c36458c4e
9 changed files with 18 additions and 5 deletions

View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
KUBE_PS1_KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}"
KUBE_PS1_KUBECONFIGMD5=
KUBE_PS1_CTX=