resolve conflict
This commit is contained in:
parent
9cedca4ecf
commit
55034760a1
1 changed files with 1 additions and 3 deletions
4
.alias
4
.alias
|
@ -12,6 +12,4 @@ alias so='ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -l roo
|
|||
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/
|
||||
alias sa='ssh-agent -k; eval $(ssh-agent) && ssh-add ~/.ssh/*.ed25519'
|
Loading…
Reference in a new issue