summaryrefslogtreecommitdiffstats
path: root/usr/local/www/system_advanced.php
diff options
context:
space:
mode:
authorHolger Bauer <hoba@pfsense.org>2005-06-27 18:46:12 +0000
committerHolger Bauer <hoba@pfsense.org>2005-06-27 18:46:12 +0000
commitdbb0b7d610425d1d4b82e803e26364a49641dbe3 (patch)
treec74583b171490b8ff0ff3b2a983fa2c80b6f3a8a /usr/local/www/system_advanced.php
parent5508cf572921eb77f657e8775787268873180447 (diff)
downloadpfsense-dbb0b7d610425d1d4b82e803e26364a49641dbe3.zip
pfsense-dbb0b7d610425d1d4b82e803e26364a49641dbe3.tar.gz
fixed platform error that caused page not to show. thanks to anonymous ;-)
Diffstat (limited to 'usr/local/www/system_advanced.php')
-rwxr-xr-xusr/local/www/system_advanced.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php
index e7c49e5..1779bde 100755
--- a/usr/local/www/system_advanced.php
+++ b/usr/local/www/system_advanced.php
@@ -244,7 +244,11 @@ function update_description(itemnum) {
<table width="100%" border="0" cellpadding="6" cellspacing="0">
+<<<<<<< system_advanced.php
+ <?php if($g['platform'] == "pfSense" || $g['platform'] == "cdrom"): ?>
+=======
<?php if($g['platform'] == "pfSense" or if($g['platform'] == "cdrom"): ?>
+>>>>>>> 1.64
<tr>
<td colspan="2" valign="top" class="listtopic">Enable Serial Console</td>
</tr>
OpenPOWER on IntegriCloud