removed git bullcrap

This commit is contained in:
opalvaults
2022-07-20 08:50:33 -07:00
parent c023f08628
commit 1cdf0cade3

View File

@@ -128,7 +128,6 @@ prompt_purification_setup() {
prompt_purification_setup
<<<<<<< HEAD
source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
bindkey "^[[1;5C" forward-word
@@ -136,9 +135,5 @@ bindkey "^[[1;5D" backward-word
#source <(kubectl completion zsh)
export PATH="$PATH:/root/.local/bin"
=======
bindkey "^[[1;5C" forward-word
bindkey "^[[1;5D" backward-word
#export PATH="$PATH:/root/.local/bin"
>>>>>>> origin/master