mirror of
https://github.com/pi-hole/pi-hole
synced 2024-12-22 14:58:08 +00:00
reverting to default
This commit is contained in:
parent
f1f2614e65
commit
4ed48e19f2
@ -25,16 +25,4 @@ compress.filetype = ( "application/javascript", "text/css", "text/html
|
|||||||
# default listening port for IPv6 falls back to the IPv4 port
|
# default listening port for IPv6 falls back to the IPv4 port
|
||||||
include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
|
include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
|
||||||
include_shell "/usr/share/lighttpd/create-mime.assign.pl"
|
include_shell "/usr/share/lighttpd/create-mime.assign.pl"
|
||||||
include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
|
include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
|
||||||
|
|
||||||
<<<<<<< Updated upstream
|
|
||||||
$HTTP["host"] == "ads-v-darwin.hulu.com|ad.hulu.com|t.hulu.com|t2.hulu.com|doubleclick.net" {
|
|
||||||
url.redirect = (
|
|
||||||
"^/(.*)" => "http://192.168.1.101:8200/MediaItems/19.mov",
|
|
||||||
)
|
|
||||||
=======
|
|
||||||
$HTTP["host"] == "ads-v-darwin.hulu.com" {
|
|
||||||
url.redirect = (
|
|
||||||
"^/(.*)" => "http://192.168.1.101:8200/MediaItems/19.mov",
|
|
||||||
)
|
|
||||||
>>>>>>> Stashed changes
|
|
Loading…
Reference in New Issue
Block a user