diff options
-rw-r--r-- | manifests/init.pp | 4 |
1 files changed, 0 insertions, 4 deletions
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 |