summaryrefslogtreecommitdiffstats
path: root/usr/local/www/system_advanced.php
diff options
context:
space:
mode:
authorHolger Bauer <hoba@pfsense.org>2005-06-27 18:48:28 +0000
committerHolger Bauer <hoba@pfsense.org>2005-06-27 18:48:28 +0000
commita8aba541992f6818ef76e68c3eb1d2e7525061ec (patch)
treecd1c1bfc034a4ae26ad2f00bb3783182c7462077 /usr/local/www/system_advanced.php
parentdbb0b7d610425d1d4b82e803e26364a49641dbe3 (diff)
downloadpfsense-a8aba541992f6818ef76e68c3eb1d2e7525061ec.zip
pfsense-a8aba541992f6818ef76e68c3eb1d2e7525061ec.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, 0 insertions, 4 deletions
diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php
index 1779bde..249ca60 100755
--- a/usr/local/www/system_advanced.php
+++ b/usr/local/www/system_advanced.php
@@ -244,11 +244,7 @@ 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