mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-11-15 02:42:58 +00:00
attempt to fix
This commit is contained in:
parent
3b6ecc573e
commit
15d68467a1
1 changed files with 0 additions and 5 deletions
|
@ -319,13 +319,8 @@ gravity_reload() {
|
|||
#First escape forward slashes in the path:
|
||||
adList=${adList//\//\\\/}
|
||||
#Now replace the line in dnsmasq file
|
||||
<<<<<<< HEAD
|
||||
# sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf
|
||||
|
||||
=======
|
||||
sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf
|
||||
>>>>>>> upstream/promoTweaksTheSecond
|
||||
|
||||
pihole restartdns
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue