From 88a64597732e5e4aac20597bd492b2cfdf412b85 Mon Sep 17 00:00:00 2001
From: James Edwards <j.a.edwards86@googlemail.com>
Date: Fri, 15 Aug 2014 09:47:35 +0100
Subject: Fixing merge typos.

---
 manifests/init.pp   | 2 +-
 manifests/params.pp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index e0f1727..aad06d5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -38,7 +38,7 @@ class rsyslog (
   $ssl                    = $rsyslog::params::ssl,
   $modules                = $rsyslog::params::modules,
   $preserve_fqdn          = $rsyslog::params::preserve_fqdn,
-  $max_message_size       = $rsyslog::params::max_message_size
+  $max_message_size       = $rsyslog::params::max_message_size,
   $extra_modules	        = $rsyslog::params::extra_modules
 ) inherits rsyslog::params {
   class { 'rsyslog::install': }
diff --git a/manifests/params.pp b/manifests/params.pp
index 9161f3e..0a03d07 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -151,7 +151,6 @@ class rsyslog::params {
         '$ModLoad imklog   # provides kernel logging support (previously done by rklogd)',
         '#$ModLoad immark  # provides --MARK-- message capability',
       ]
-    }
       $extra_modules          = []
   }
     freebsd: {
-- 
cgit v1.2.3