diff options
| author | David Wood <david@wood2.org.uk> | 2015-12-31 13:46:50 +0000 |
|---|---|---|
| committer | David Wood <david@wood2.org.uk> | 2015-12-31 13:46:50 +0000 |
| commit | 60e15be211c5de855ab3d9746c78eb7296c50cde (patch) | |
| tree | 862af8eaa4a8ba95af792b3c98c484e33f2bc2ca /src/etc/inc/vslb.inc | |
| parent | 2e4cad90499f968474c4eca0852f352f1526b617 (diff) | |
| parent | 8dccfb20643cfda6b55429177410e6c66fcf0bbd (diff) | |
| download | pfsense-60e15be211c5de855ab3d9746c78eb7296c50cde.zip pfsense-60e15be211c5de855ab3d9746c78eb7296c50cde.tar.gz | |
Merge remote-tracking branch 'upstream/master' into rfc4638, fix conflict with c399d0d
Diffstat (limited to 'src/etc/inc/vslb.inc')
| -rw-r--r-- | src/etc/inc/vslb.inc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/etc/inc/vslb.inc b/src/etc/inc/vslb.inc index 05bef31..cb2c50b 100644 --- a/src/etc/inc/vslb.inc +++ b/src/etc/inc/vslb.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* vslb.inc Copyright (C) 2005-2008 Bill Marquette @@ -28,12 +27,6 @@ */ -/* - pfSense_BUILDER_BINARIES: /usr/local/sbin/relayd - pfSense_MODULE: routing -*/ - - /* include all configuration functions */ class Monitor { |
