matty/dayzdockerserver
1
0
Fork 0
mirror of https://ceregatti.org/git/daniel/dayzdockerserver.git synced 2025-05-07 06:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix yet more conflicts.

Browse source
This commit is contained in:
Daniel Ceregatti 2022-07-08 22:45:06 -07:00
parent c2ca3ce46b
commit 56aa713151
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
files/dayzserver
View file

@ -216,10 +216,7 @@ fn_steamlogin_dayz(){
} }
fn_runvalidate_dayz(){ fn_runvalidate_dayz(){
<<<<<<< Updated upstream
=======
# fn_loadconfig_dayz # fn_loadconfig_dayz
>>>>>>> Stashed changes
${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" +app_update "${appid}" validate +quit ${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" +app_update "${appid}" validate +quit
} }