fix stash issue

5 years ago · 23ecfbd6cf
10 changed files with 2 additions and 92 deletions
--- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg
@ -137,20 +137,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-valve"

-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"

->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Killing Floor 2"
--- a/lgsm/config-default/config-lgsm/kfserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/kfserver/_default.cfg
@ -143,20 +143,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-unreal2"

-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"

->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Killing Floor"
--- a/lgsm/config-default/config-lgsm/mhserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/mhserver/_default.cfg
@ -139,20 +139,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-valve"

-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"

->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="MORDHAU"
--- a/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg
@ -124,20 +124,10 @@ stopmode="3"
 querymode="2"
 querytype="protocol-quake3"

-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"

->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Medal of Honor: Allied Assault"
--- a/lgsm/config-default/config-lgsm/qlserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/qlserver/_default.cfg
@ -131,20 +131,10 @@ stopmode="3"
 querymode="2"
 querytype="protocol-valve"

-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="yes"

->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Quake Live"
--- a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg
@ -139,20 +139,10 @@ stopmode="9"
 querymode="2"
 querytype="protocol-valve"

-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="yes"

->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Ricochet"
--- a/lgsm/config-default/config-lgsm/roserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/roserver/_default.cfg
@ -139,20 +139,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-unreal2"

-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"

->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Red Orchestra: Ostfront 41-45"
--- a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg
@ -123,20 +123,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-unreal2"

-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"

->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Unreal Tournament 2004"
--- a/lgsm/config-default/config-lgsm/ut99server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ut99server/_default.cfg
@ -123,20 +123,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-gamespy1"

-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"

->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Unreal Tournament 99"