From fd8e4789b6dde1ada36df3592708471b5ae8a71a Mon Sep 17 00:00:00 2001
From: KenwoodFox <kenwood364@gmail.com>
Date: Tue, 24 Aug 2021 21:20:22 -0400
Subject: [PATCH] clean

---
 .ssh/config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.ssh/config b/.ssh/config
index 11b7855..b71050f 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -52,7 +52,6 @@ Host aur.archlinux.org
     IdentityFile ~/.ssh/aur
     User aur
 
-<<<<<<< Updated upstream
 # Personal Git Server
 Host kitsunehosting.net
     Port 2222