Oops

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index acd29f063f72853b93ce9a85f1900714ebe50a81..feda98e5346e96e1416651aa8f84f4821c74f21a 100644 (file)
--- 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