From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 27 Dec 2009 19:52:43 +0000 (-0200)
Subject: Oops
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=072a967c61eb6c0f3a9856ba0b393757c553a179;p=puppet-virtual.git

Oops
---

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