summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2007-05-09 15:42:19 +0000
committerScott Ullrich <sullrich@pfsense.org>2007-05-09 15:42:19 +0000
commit9c9de6f702d6c186d96097e583719cf117377a10 (patch)
tree8f3b26daa056856d065969d85d8c58b26a422b15 /usr
parent98a56ef7b88c27357e8d9150e176dfd8625de5bd (diff)
downloadpfsense-9c9de6f702d6c186d96097e583719cf117377a10.zip
pfsense-9c9de6f702d6c186d96097e583719cf117377a10.tar.gz
Unbreak firewall_nat_out.php Pointy-hat-to: smos
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/firewall_nat_out.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 156e149..640db8f 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -1,9 +1,5 @@
<?php
-<<<<<<< firewall_nat_out.php
/* $Id$ */
-=======
-/* $Id$ */
->>>>>>> 1.47.2.16.2.1
/*
firewall_nat_out.php
Copyright (C) 2004 Scott Ullrich
OpenPOWER on IntegriCloud