From ca8f5231dea873b9fa04700101500d0bbe277e15 Mon Sep 17 00:00:00 2001 From: Defent Date: Wed, 26 Aug 2015 15:07:56 +0200 Subject: [PATCH 1/2] Update DMS_init.sqf --- DMS_init.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DMS_init.sqf b/DMS_init.sqf index 239a0f4..5ad67c2 100644 --- a/DMS_init.sqf +++ b/DMS_init.sqf @@ -21,13 +21,13 @@ if(isServer) then { //DMS_MissionMax = 120; // Timers in seconds // CONFIGS -<<<<<<< HEAD + uiSleep 2; -======= + call DMS_selectMission; ->>>>>>> origin/master + //[] call compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_selectMission.sqf"; //[] execVM "\x\addons\dms\scripts\DMS_selectMission.sqf"; From ba042da2a32ce2d9ac48d77acfbbce9dc2786834 Mon Sep 17 00:00:00 2001 From: Defent Date: Wed, 26 Aug 2015 15:08:13 +0200 Subject: [PATCH 2/2] Github fucked with my file.. --- DMS_init.sqf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DMS_init.sqf b/DMS_init.sqf index 5ad67c2..d35dfce 100644 --- a/DMS_init.sqf +++ b/DMS_init.sqf @@ -21,19 +21,14 @@ if(isServer) then { //DMS_MissionMax = 120; // Timers in seconds // CONFIGS - - uiSleep 2; call DMS_selectMission; - - //[] call compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_selectMission.sqf"; //[] execVM "\x\addons\dms\scripts\DMS_selectMission.sqf"; call DMS_selectMission; diag_log "DMS :: Functions loaded - starting the rest of the script."; - };