From 71195bcd859d30e43e40272261c8a0dc6ac33889 Mon Sep 17 00:00:00 2001 From: wiad Date: Tue, 19 Jan 2016 12:01:44 +0100 Subject: [PATCH] fix syntax --- includes/definitions.inc.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 89f85f7ee..badb80824 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -1440,13 +1440,11 @@ $config['os'][$os]['over'][1]['text'] = 'CPU Usage'; $config['os'][$os]['over'][2]['graph'] = 'device_mempool'; $config['os'][$os]['over'][2]['text'] = 'Memory Usage'; -<<<<<<< HEAD $os = 'nios'; $config['os'][$os]['text'] = 'Infoblox'; $config['os'][$os]['type'] = 'appliance'; $config['os'][$os]['icon'] = 'infoblox'; -======= // Lenovo EMC (NAS) $os = 'lenovoemc'; $config['os'][$os]['type'] = 'storage'; @@ -1459,7 +1457,6 @@ $config['os'][$os]['over'][1]['graph'] = 'device_processor'; $config['os'][$os]['over'][1]['text'] = 'CPU Usage'; $config['os'][$os]['over'][2]['graph'] = 'device_mempool'; $config['os'][$os]['over'][2]['text'] = 'Memory Usage'; ->>>>>>> ded1fa3e73bcd99f03259cc449e8cd816664a158 // Graph Types require_once $config['install_dir'].'/includes/load_db_graph_types.inc.php';