diff options
| author | Bill Marquette <bill.marquette@gmail.com> | 2009-03-11 23:29:39 -0500 |
|---|---|---|
| committer | Bill Marquette <bill.marquette@gmail.com> | 2009-03-11 23:29:39 -0500 |
| commit | 63d05a4f715edec23b1aedd035e14c5eb6f51669 (patch) | |
| tree | e7f3fbe8503994d8295a1533024fd37b57f21729 /usr/local/www/includes | |
| parent | 4a1cd18fe7f4039534a1f9f3c22916ace411226b (diff) | |
| download | pfsense-63d05a4f715edec23b1aedd035e14c5eb6f51669.zip pfsense-63d05a4f715edec23b1aedd035e14c5eb6f51669.tar.gz | |
fix merge conflict
Diffstat (limited to 'usr/local/www/includes')
| -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 |
