diff options
| -rw-r--r-- | manifests/irc_bot.pp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/manifests/irc_bot.pp b/manifests/irc_bot.pp index 88d769c..7e934ef 100644 --- a/manifests/irc_bot.pp +++ b/manifests/irc_bot.pp @@ -1,4 +1,3 @@ -<<<<<<< HEAD class nagios::irc_bot( $nsa_socket = 'absent', $nsa_server, |