diff options
| author | jim-p <jimp@pfsense.org> | 2011-07-13 08:31:39 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-07-13 08:31:39 -0400 |
| commit | cdfdb1a7f64846c34c642606a789b003624b20b9 (patch) | |
| tree | 410723bd476bc0a1f382f43e8144c4a313a8c797 | |
| parent | d685dad4d0409c326b0cf30efea559abdbfe3eb6 (diff) | |
| download | pfsense-cdfdb1a7f64846c34c642606a789b003624b20b9.zip pfsense-cdfdb1a7f64846c34c642606a789b003624b20b9.tar.gz | |
Fix merge conflict
| -rw-r--r-- | etc/inc/easyrule.inc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/etc/inc/easyrule.inc b/etc/inc/easyrule.inc index 39a4f24..d176f78 100644 --- a/etc/inc/easyrule.inc +++ b/etc/inc/easyrule.inc @@ -245,12 +245,8 @@ function easyrule_pass_rule_add($int, $proto, $srchost, $dsthost, $dstport, $ipp $filterent = array(); $filterent['type'] = 'pass'; $filterent['interface'] = $int; -<<<<<<< HEAD $filterent['ipprotocol'] = $ipproto; - $filterent['descr'] = "Easy Rule: Passed from Firewall Log View"; -======= $filterent['descr'] = gettext("Easy Rule: Passed from Firewall Log View"); ->>>>>>> upstream/master if ($proto != "any") $filterent['protocol'] = $proto; |
