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 01:00:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

conflict resolve

Browse source
This commit is contained in:
Siddhu 2017-12-08 00:32:29 +05:30
parent 3e246f99ca
commit eb2d86bf19
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
advanced/Scripts/webpage.sh
View file

@ -599,15 +599,12 @@ main() {
"-i" | "interface" ) SetListeningMode "$@";;
"-t" | "teleporter" ) Teleporter;;
"adlist" ) CustomizeAdLists;;
<<<<<<< HEAD
"-s" | "speedtest" ) ChageSpeedTestSchedule;;
"-sd" ) UpdateSpeedTestRange;;
"-sn" ) RunSpeedtestNow;;
"-sc" ) ClearSpeedtestData;;
"-ss" ) SpeedtestServer;;
=======
"audit" ) audit;;
>>>>>>> 5ba413569ea8a4220c7e3bd2fa8c28b33b9e8492
* ) helpFunc;;
esac