From: martin f. krafft <madduck@madduck.net>
Date: Thu, 27 Oct 2011 19:21:36 +0000 (+0200)
Subject: cleanup
X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/49ba1a1f0597a5b7be3c09563ed37eda3fd6eabc?hp=dc07e6c5c6245f67b1add9b5eb3596f01e41968b

cleanup
---

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