From 456e7c7623267cbfba404926637f30f5f1c197c7 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Mon, 3 May 2010 09:49:24 -0300
Subject: Removing invalid string from code

---
 usr/local/www/system_gateway_groups_edit.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'usr/local')

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>";
-- 
cgit v1.1