From 28adb8942d9e0c515c5ce34fbf92ae0272634c26 Mon Sep 17 00:00:00 2001
From: vbawol <vbawol@veteranbastards.com>
Date: Wed, 11 Oct 2017 11:38:51 -0500
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/release'
 into experimental

# Conflicts:
#	Server_Install_Pack/sc/battleye/scripts.txt
---
 Server_Install_Pack/sc/battleye/scripts.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Server_Install_Pack/sc/battleye/scripts.txt b/Server_Install_Pack/sc/battleye/scripts.txt
index 2f3830da..937f9122 100644
--- a/Server_Install_Pack/sc/battleye/scripts.txt
+++ b/Server_Install_Pack/sc/battleye/scripts.txt
@@ -1,5 +1,6 @@
 //new2
 5 "BIS_fnc_dynamictext" !="\"BIS_fnc_dynamictext\"" !="'BIS_fnc_dynamictext'"
+5 loadFile
 5 forceRespawn !="ForceRespawnDuration" !="reviveHandleForceRespawnAction" !="forcerespawn player;"
 5 setFriend
 5 setAmmo
@@ -64,7 +65,6 @@
 5 ctrlModelUp
 5 ctrlSetDirection
 5 deleteVehicleCrew !="fn_deleteVehicleCrew.sqf" !="\"BIS_fnc_deleteVehicleCrew\""
-5 loadFile
 5 selectPlayer !="selectPlayer _playerObject;"
 5 setGroupIconsVisible
 5 setGroupIconsVisible