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