From 7b083285a9e2d0e04b0f23d7f7f6fb9c2cf395fa Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 25 Jan 2014 11:49:47 +0000
Subject: [PATCH] Fixed bug with Git code ending up in the script

Fixed bug with Git code ending up in the script
---
 CounterStrikeConditionZero/csczserver   | 2 ++
 CounterStrikeGlobalOffensive/csgoserver | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver
index 487847be2..79d0e1364 100644
--- a/CounterStrikeConditionZero/csczserver
+++ b/CounterStrikeConditionZero/csczserver
@@ -605,6 +605,8 @@ sleep 1
 mkdir -pv "${filesdir}"
 cd "${rootdir}/steamcmd"
 STEAMEXE=steamcmd ./steamcmd.sh +login ${steamuser} ${steampass} +force_install_dir "${filesdir}" +app_update ${appid} validate +quit
+STEAMEXE=steamcmd ./steamcmd.sh +login ${steamuser} ${steampass} +force_install_dir "${filesdir}" +app_update ${appid} validate +quit
+STEAMEXE=steamcmd ./steamcmd.sh +login ${steamuser} ${steampass} +force_install_dir "${filesdir}" +app_update ${appid} validate +quit
 echo ""
 echo "================================="
 while true; do
diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver
index 816bf608e..a1cb8767d 100644
--- a/CounterStrikeGlobalOffensive/csgoserver
+++ b/CounterStrikeGlobalOffensive/csgoserver
@@ -24,20 +24,17 @@ steampass=""
 # Demolition                 1            1
 gamemode="0"
 gametype="0"
-<<<<<<< HEAD
 defaultmap="de_dust"
 mapgroup="random_classic"
 maxplayers="16"
 =======
 defaultmap="de_dust2"
 mapgroup="random_classic"
->>>>>>> Major update 240114
 port="27015"
 sourcetvport="27020"
 clientport="27005"
 ip="0.0.0.0"
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
-<<<<<<< HEAD
 # Change the parameter "-maxplayers" to "-maxplayers_override" for force the max player limit
 parms="-game csgo -usercon +map ${defaultmap} +mapgroup ${defaultmap} +game_mode ${gamemode} +game_type ${gametype} -strictportbind -ip ${ip} -port ${port} +tv_port ${sourcetvport} +clientport ${clientport} -maxplayers ${maxplayers}"
 =======
@@ -45,7 +42,6 @@ parms="-game csgo -usercon +map ${defaultmap} +mapgroup ${defaultmap} +game_mode
 fn_parms(){
 parms="-game csgo -usercon +map ${defaultmap} +mapgroup ${mapgroup} +game_mode ${gamemode} +game_type ${gametype} -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -maxplayers ${maxplayers}"
 }
->>>>>>> Major update 240114
 
 #### Advanced Variables ####