From 46b6df124024a1104640f446b8a87492df52ddb4 Mon Sep 17 00:00:00 2001
From: mergwyn <gary@theclarkhome.com>
Date: Tue, 7 Jul 2020 13:39:40 +0100
Subject: [PATCH] Yet more merge conflict errors

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 6f4023d..e9d54bb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -281,7 +281,7 @@ class ssh (
           $default_sshd_config_print_motd             = 'no'
           $default_sshd_config_serverkeybits          = undef
           $default_sshd_config_subsystem_sftp         = '/usr/lib/openssh/sftp-server'
-          $default_sshd_config_tcp_keepalive          = 'yes'
+          $default_sshd_config_tcp_keepalive          = undef
           $default_sshd_config_use_dns                = 'yes'
           $default_sshd_config_xauth_location         = undef
           $default_sshd_gssapiauthentication          = 'yes'