diff options
Diffstat (limited to 'templates/defaultclient.erb')
-rw-r--r-- | templates/defaultclient.erb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/defaultclient.erb b/templates/defaultclient.erb index 5611bf4..7d754a7 100644 --- a/templates/defaultclient.erb +++ b/templates/defaultclient.erb @@ -11,5 +11,8 @@ address <%= munin_host_real %> port <%= munin_port_real %> use_node_name yes +<<<<<<< HEAD +======= load.load.warning 5 load.load.critical 10 +>>>>>>> 76352415fec5c2ab6975e3a8843dd4983f7cae6a |