diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-01 10:42:07 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-01 10:42:07 -0400 |
| commit | b5ef447f578b8f38d3fbfc560f75d2c8838b88de (patch) | |
| tree | 89f18ddd65717ef64062aeb5ae95fd4deb0bb95b /etc/inc/pfsense-utils.inc | |
| parent | 58005e521346eea230c564aacf34b0820b9a6123 (diff) | |
| download | pfsense-b5ef447f578b8f38d3fbfc560f75d2c8838b88de.zip pfsense-b5ef447f578b8f38d3fbfc560f75d2c8838b88de.tar.gz | |
Fix merge blip.
Diffstat (limited to 'etc/inc/pfsense-utils.inc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index ddbecbb..b9378e6 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -2264,9 +2264,6 @@ function load_mac_manufacturer_table() { return -1; } -<<<<<<< HEAD -?> -======= /****f* pfsense-utils/is_ipaddr_configured * NAME @@ -2307,4 +2304,3 @@ function pfSense_handle_custom_code($src_dir) { } ?> ->>>>>>> upstream/master |
