fix conflict

Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable
2016-10-20 10:09:23 -04:00
parent 9427b1e594 c71a976e76
commit 3b6ecc573e
2 changed files with 5 additions and 5 deletions
--- a/gravity.sh
+++ b/gravity.sh
@@ -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
 }