diff options
| author | Micah Anderson <micah@riseup.net> | 2009-12-22 19:48:36 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-12-22 19:48:36 -0500 |
| commit | 8f711a933dbc0917b43d5e29b98da7157bd5727f (patch) | |
| tree | 8662b3089ee084dfb3d87c929c0574fef3d1c4ee /templates | |
| parent | 42c94b4fad526b25852c7bcaf053f441bac38c9e (diff) | |
fix some merge problems
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/defaultclient.erb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/templates/defaultclient.erb b/templates/defaultclient.erb index 7d754a7..5611bf4 100644 --- a/templates/defaultclient.erb +++ b/templates/defaultclient.erb @@ -11,8 +11,5 @@ address <%= munin_host_real %> port <%= munin_port_real %> use_node_name yes -<<<<<<< HEAD -======= load.load.warning 5 load.load.critical 10 ->>>>>>> 76352415fec5c2ab6975e3a8843dd4983f7cae6a |