1
1
Fork 0

Fix merge

This commit is contained in:
Kenwood 2021-08-24 18:36:18 -04:00
parent 2f533116b7
commit bcf9cfa699
1 changed files with 5 additions and 0 deletions

View File

@ -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