fix conflict

Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable

advanced/pihole.cron

@@ -16,10 +16,6 @@
 # Pi-hole: Update Pi-hole! Uncomment to enable auto update
 #30 2    * * 7   root    /usr/local/bin/pihole updatePihole
 
-# Pi-hole: Parse the log file before it is flushed and save the stats to a database
-#          This will be used for a historical view of your Pi-hole's performance
-#50 23  * * *   root    /usr/local/bin/dailyLog.sh # note: this is outdated
-
 # Pi-hole: Flush the log daily at 00:00 so it doesn't get out of control
 #          Stats will be viewable in the Web interface thanks to the cron job above
 00 00   * * *   root    /usr/local/bin/pihole flush

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
 }