diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-12-27 17:52:43 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-12-27 17:52:43 -0200 |
| commit | 072a967c61eb6c0f3a9856ba0b393757c553a179 (patch) | |
| tree | 85982ac60aae407624ac94203ad922897db04fbe /manifests/vserver.pp | |
| parent | fb09f12c8a838372b64304fb40f047671e020d27 (diff) | |
| download | puppet-virtual-072a967c61eb6c0f3a9856ba0b393757c553a179.tar.gz puppet-virtual-072a967c61eb6c0f3a9856ba0b393757c553a179.tar.bz2 | |
Oops
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 |