mirror of
https://github.com/pi-hole/pi-hole.git
synced 2025-04-05 07:00:19 +00:00
conflict resolve
This commit is contained in:
parent
3e246f99ca
commit
eb2d86bf19
1 changed files with 0 additions and 3 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue