diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-04-04 21:48:39 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-04-04 21:48:39 -0500 |
| commit | 75f163f08a49f15f30bba543e9f6fbcf18aa74b2 (patch) | |
| tree | 08845b4defbc614cb6e6ee1cfb5dc7e43c4a6128 /etc | |
| parent | 686e53c0001704fc8bd3f19eb73a0c034bd730f6 (diff) | |
| download | pfsense-75f163f08a49f15f30bba543e9f6fbcf18aa74b2.zip pfsense-75f163f08a49f15f30bba543e9f6fbcf18aa74b2.tar.gz | |
Un-screw-up merge
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/services.inc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 9c58b24..7fbc3e0 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -140,14 +140,9 @@ function services_radvd_configure($blacklist = array()) { $radvdconf .= "\tAdvLinkMTU {$mtu};\n"; } else { $radvdconf .= "\tAdvLinkMTU 1280;\n"; -<<<<<<< HEAD } // $radvdconf .= "\tDeprecatePrefix on;\n"; switch ($dhcpv6ifconf['rapriority']) { -======= - - switch($dhcpv6ifconf['rapriority']) { ->>>>>>> 38253ce... Include additional subnets for RAs in radvd.conf. Ticket #4468 case "low": $radvdconf .= "\tAdvDefaultPreference low;\n"; break; |
