Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-26 09:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix conflict

Browse source 
Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable
This commit is contained in:
Tommy Huff 2016-10-20 10:09:23 -04:00
commit 3b6ecc573e
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gravity.sh
View file

@ -319,8 +319,12 @@ 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
find "$piholeDir" -type f -exec chmod 666 {} \;
=======
sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf
>>>>>>> upstream/promoTweaksTheSecond
pihole restartdns
}