resolve conflict

This commit is contained in:
Aaron Riedel 2022-05-22 04:24:04 +02:00
parent 9cedca4ecf
commit 55034760a1
Signed by: aaron
GPG key ID: 643004654D40D577

2
.alias
View file

@ -13,5 +13,3 @@ alias mci='docker exec -i mc rcon-cli'
alias mc='docker exec mc rcon-cli'
alias sa='ssh-agent -k; eval $(ssh-agent) && ssh-add ~/.ssh/*.ed25519'
PATH=$PATH:/usr/games/