From 072a967c61eb6c0f3a9856ba0b393757c553a179 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 27 Dec 2009 17:52:43 -0200
Subject: Oops

---
 manifests/vserver.pp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'manifests')

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
-- 
cgit v1.2.3