From bcf9cfa69990b12dd88e9200cb0f0457348809d3 Mon Sep 17 00:00:00 2001
From: KenwoodFox <kenwood364@gmail.com>
Date: Tue, 24 Aug 2021 18:36:18 -0400
Subject: [PATCH] Fix merge

---
 .ssh/config | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.ssh/config b/.ssh/config
index 6c488df..11b7855 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -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