From 56aa71315187364069e2836cdd221302d15c72fb Mon Sep 17 00:00:00 2001
From: Daniel Ceregatti <Daniel.Ceregatti@PolicyMap.com>
Date: Fri, 8 Jul 2022 22:45:06 -0700
Subject: [PATCH] Fix yet more conflicts.

---
 files/dayzserver | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/files/dayzserver b/files/dayzserver
index 32fc62e..2ba6ca4 100755
--- a/files/dayzserver
+++ b/files/dayzserver
@@ -216,10 +216,7 @@ fn_steamlogin_dayz(){
 }
 
 fn_runvalidate_dayz(){
-<<<<<<< Updated upstream
-=======
 #	fn_loadconfig_dayz
->>>>>>> Stashed changes
 	${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" +app_update "${appid}" validate +quit
 }