From 8f711a933dbc0917b43d5e29b98da7157bd5727f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Dec 2009 19:48:36 -0500 Subject: fix some merge problems --- templates/defaultclient.erb | 3 --- 1 file changed, 3 deletions(-) (limited to 'templates') 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 -- cgit v1.2.3