summaryrefslogtreecommitdiffstats
path: root/usr/local/www/system_gateway_groups_edit.php
diff options
context:
space:
mode:
Diffstat (limited to 'usr/local/www/system_gateway_groups_edit.php')
-rwxr-xr-xusr/local/www/system_gateway_groups_edit.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
index 533abd5..9376f03 100755
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -172,7 +172,6 @@ include("head.inc");
$selected[0] = "selected";
}
}
-<<<<<<< HEAD
echo "<select name='{$gwname}' class='formfldselect' id='{$gwname}'>";
echo "<option value='0' $selected[0] >" . gettext("Never") . "</option>";
echo "<option value='1' $selected[1] >" . gettext("Tier 1") . "</option>";
OpenPOWER on IntegriCloud