From 4014ccdfea44498e8abd51a33073e0c5ecde0c36 Mon Sep 17 00:00:00 2001
From: Marcel Haerry <haerry@puzzle.ch>
Date: Tue, 22 Apr 2008 11:52:31 +0200
Subject: merged last things

---
 manifests/init.pp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index e1f62a6..6b6cd08 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,12 +1,8 @@
 # munin.pp - everything a sitewide munin installation needs
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
 # See LICENSE for the full license granted to you.
-<<<<<<< HEAD:manifests/init.pp
 # adapted by Puzzle ITC - haerry+puppet(at)puzzle.ch
 #
-=======
-
->>>>>>> immerda/master:manifests/init.pp
 # the port is a parameter so vservers can share IP addresses and still be happy
 
 # Define where the individual nodes' configs are stored
-- 
cgit v1.2.3