diff options
Diffstat (limited to 'usr/local/www/includes/functions.inc.php')
| -rw-r--r-- | usr/local/www/includes/functions.inc.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php index c62e9d9..ef64837 100644 --- a/usr/local/www/includes/functions.inc.php +++ b/usr/local/www/includes/functions.inc.php @@ -178,7 +178,6 @@ function mem_usage() return $memUsage; } -<<<<<<< HEAD:usr/local/www/includes/functions.inc.php function update_date_time() { $datetime = date("D M j G:i:s T Y"); @@ -264,6 +263,3 @@ function get_interfacestatus(){ } ?> -======= -?> ->>>>>>> 9d75714... cleaner and more proper cpu graph:usr/local/www/includes/functions.inc.php |
