Update ts3_updater.sh

Lacrimosa99 · May 11, 2017 · aa95453 · aa95453
1 parent 7f72d18
commit aa95453
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/ts3_updater.sh b/ts3_updater.sh
@@ -115,21 +115,10 @@ SERVER_START_MINIMAL() {
 SERVER_START() {
 	yellowMessage "Start TS3 and TSDNS Server..."
 
-<<<<<<< HEAD
 	su "$TS_USER" -c "$TS_MASTER_PATH/ts3server_startscript.sh start" 2>&1 >/dev/null
 	sleep 2
 	if [ -f "$TS_DNS_PATH"/tsdns_startscript.sh ]; then
 		su "$TS_USER" -c "$TS_DNS_PATH/tsdns_startscript.sh start" 2>&1 >/dev/null
-=======
-	if [ -f "$TS_MASTER_PATH"/ts3server.pid ]; then
-		su "$TS_USER" -c ""$TS_MASTER_PATH"/ts3server_startscript.sh restart" 2>&1 >/dev/null
-	else
-		su "$TS_USER" -c ""$TS_MASTER_PATH"/ts3server_startscript.sh start" 2>&1 >/dev/null
-		sleep 2
-		if [ -f "$TS_DNS_PATH"/tsdns_startscript.sh ]; then
-			su "$TS_USER" -c ""$TS_DNS_PATH"/tsdns_startscript.sh start" 2>&1 >/dev/null
-		fi
->>>>>>> origin/master
 	fi
 
 	sleep 2