diff options
Diffstat (limited to 'manifests/vserver.pp')
| -rw-r--r-- | manifests/vserver.pp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/manifests/vserver.pp b/manifests/vserver.pp index acd29f0..feda98e 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -56,7 +56,6 @@ class vserver::host { "/etc/modprobe.d/local-dummy": ensure => absent, mode => 0644, owner => root, group => root; -<<<<<<< HEAD:manifests/vserver.pp } # Setup some plugins if munin is enabled in the system |