X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/dc07e6c5c6245f67b1add9b5eb3596f01e41968b..34217838567c32a093ec53994367fd0a1741ce06:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 67ff7e7..0623a4e 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -92,11 +92,6 @@ Host madduck.net
 Host imap.madduck.net
   HostKeyAlias seamus.madduck.net
 
-Host diamond.madduck.net | diamond
-  ForwardAgent yes
-<<<<<<< HEAD
-  Hostname bell.madduck.net
-
 Host diamond.madduck.net | diamond
   ForwardAgent yes
   Hostname diamond.madduck.net