Fix merge
This commit is contained in:
parent
2f533116b7
commit
bcf9cfa699
|
@ -52,11 +52,16 @@ Host aur.archlinux.org
|
|||
IdentityFile ~/.ssh/aur
|
||||
User aur
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
# Personal Git Server
|
||||
Host kitsunehosting.net
|
||||
Port 2222
|
||||
IdentityFile ~/.ssh/gitea
|
||||
|
||||
# Github
|
||||
Host github.com
|
||||
IdentityFile ~/.ssh/github
|
||||
|
||||
|
||||
# Silvertech
|
||||
Host devserver
|
||||
|
|
Loading…
Reference in New Issue