diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-05-07 02:57:18 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-05-07 02:57:18 +0000 |
| commit | 8989d525cda58d4ca0b1dabeb4055e4369d6a3a2 (patch) | |
| tree | 0890670a9d1ed012be44df1d40b24ae871c15dfe /usr/local/www/system_firmware.php | |
| parent | be50139e1e490ac62c5d42be8f9506538c941100 (diff) | |
| download | pfsense-8989d525cda58d4ca0b1dabeb4055e4369d6a3a2.zip pfsense-8989d525cda58d4ca0b1dabeb4055e4369d6a3a2.tar.gz | |
Remove conflict line
Diffstat (limited to 'usr/local/www/system_firmware.php')
| -rwxr-xr-x | usr/local/www/system_firmware.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 4e70bb1..b9ba6cb 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -149,10 +149,7 @@ print_info_box($sig_warning); <ul id="tabnav"> <li class="tabact">Firmware Update</a></li> <li class="tabinact"><a href="system_firmware_check.php">Auto Update</a></li> -<<<<<<< system_firmware.php -======= <li class="tabact">Manual Update</a></li> ->>>>>>> 1.39 </ul> </td> </tr> |
