mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix syntax

Browse Source
This commit is contained in:
wiad
2016-01-19 12:01:44 +01:00
parent 913314f831
commit 71195bcd85
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/definitions.inc.php
View File

@@ -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]['graph'] = 'device_mempool';
$config['os'][$os]['over'][2]['text'] = 'Memory Usage'; $config['os'][$os]['over'][2]['text'] = 'Memory Usage';
<<<<<<< HEAD
$os = 'nios'; $os = 'nios';
$config['os'][$os]['text'] = 'Infoblox'; $config['os'][$os]['text'] = 'Infoblox';
$config['os'][$os]['type'] = 'appliance'; $config['os'][$os]['type'] = 'appliance';
$config['os'][$os]['icon'] = 'infoblox'; $config['os'][$os]['icon'] = 'infoblox';
=======
// Lenovo EMC (NAS) // Lenovo EMC (NAS)
$os = 'lenovoemc'; $os = 'lenovoemc';
$config['os'][$os]['type'] = 'storage'; $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'][1]['text'] = 'CPU Usage';
$config['os'][$os]['over'][2]['graph'] = 'device_mempool'; $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
$config['os'][$os]['over'][2]['text'] = 'Memory Usage'; $config['os'][$os]['over'][2]['text'] = 'Memory Usage';
>>>>>>> ded1fa3e73bcd99f03259cc449e8cd816664a158
// Graph Types // Graph Types
require_once $config['install_dir'].'/includes/load_db_graph_types.inc.php'; require_once $config['install_dir'].'/includes/load_db_graph_types.inc.php';