From 49ba1a1f0597a5b7be3c09563ed37eda3fd6eabc Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Thu, 27 Oct 2011 21:21:36 +0200
Subject: [PATCH] cleanup

---
 .ssh/config.in | 5 -----
 1 file changed, 5 deletions(-)

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