diff options
| author | Gabriel Filion <lelutin@gmail.com> | 2013-01-03 17:01:16 +0100 |
|---|---|---|
| committer | Gabriel Filion <lelutin@gmail.com> | 2013-01-03 17:01:16 +0100 |
| commit | 8fd89115cc15295e20234578b45fdecc8bcf1c70 (patch) | |
| tree | 0bacdf6bb651bf47e3ab8b12ae9f420fd028422f /manifests | |
| parent | 8b4e71729288d25e44d8433be27dc1a5d9fe63d9 (diff) | |
merge artifact left in one manifest
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
Diffstat (limited to 'manifests')
| -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, |