From eb2d86bf191f5c91748987d2240e1dd71b90a0b5 Mon Sep 17 00:00:00 2001
From: Siddhu <arevindh@gmail.com>
Date: Fri, 8 Dec 2017 00:32:29 +0530
Subject: [PATCH] conflict resolve

---
 advanced/Scripts/webpage.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index ef4b10d3..c2f93cf7 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -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