From 81ec143d9cd32d523a4d17a72108e0a65a10dfc9 Mon Sep 17 00:00:00 2001
From: mergwyn <gary@theclarkhome.com>
Date: Tue, 7 Jul 2020 09:18:49 +0100
Subject: [PATCH] Fix merge conflict

---
 manifests/init.pp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 035b71c..fbaf07d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -110,15 +110,7 @@ class ssh (
   $ssh_config_global_known_hosts_group        = 'root',
   $ssh_config_global_known_hosts_mode         = '0644',
   $ssh_config_user_known_hosts_file           = undef,
-<<<<<<< HEAD
-<<<<<<< HEAD
   $ssh_config_include                         = 'USE_DEFAULTS',
-=======
-  Optional[Ssh::Include] $ssh_config_include  = 'USE_DEFAULTS',
->>>>>>> 7aa838a... Align fixtures with defaults
-=======
-  $ssh_config_include                         = 'USE_DEFAULTS',
->>>>>>> bedb2727907d794c61ebfaaf552890096db3381b
   $config_entries                             = {},
   $keys                                       = undef,
   $manage_root_ssh_config                     = false,
@@ -131,15 +123,7 @@ class ssh (
   $sshd_config_key_revocation_list            = undef,
   $sshd_config_authorized_principals_file     = undef,
   $sshd_config_allowagentforwarding           = undef,
-<<<<<<< HEAD
-<<<<<<< HEAD
   $sshd_config_include                        = 'USE_DEFAULTS',
-=======
-  Optional[Ssh::Include] $sshd_config_include = 'USE_DEFAULTS',
->>>>>>> 7aa838a... Align fixtures with defaults
-=======
-  $sshd_config_include                        = 'USE_DEFAULTS',
->>>>>>> bedb2727907d794c61ebfaaf552890096db3381b
 ) {
 
   case $::osfamily {