fix merge conflict remnants

This commit is contained in:
liv 2023-11-18 15:12:32 +01:00
parent 8b239e71ce
commit 8a0d5068d1
2 changed files with 1 additions and 3 deletions

View file

@ -64,6 +64,7 @@ alias editconfig "chezmoi edit ~/.config/fish/config.fish; and chezmoi apply; an
alias doco "docker-compose"
alias czm "chezmoi"
alias zy "sudo zypper"
alias cvim "chezmoi edit"
# z is such a weird key to hit frequently, j is much better
alias j "z"
# Cargoes and Rust-s