insects/home
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflict remnants

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dot_config/fish/config.fish
View file

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

3
dot_gitconfig
View file

@ -4,10 +4,7 @@
signingkey = 0x6F33B647A7AC80CE signingkey = 0x6F33B647A7AC80CE
[core] [core]
editor = vim editor = vim
<<<<<<< Updated upstream
autocrlf = input autocrlf = input
=======
>>>>>>> Stashed changes
[push] [push]
default = simple default = simple
autoSetupRemote = true autoSetupRemote = true