Arma3_Epoch/blckeagles-revisited-RC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected Typos due to resolution of confilcts between branches.

Browse Source
This commit is contained in:
Ghostrider-GRG- 2018-03-05 20:53:49 -05:00
parent c29d518f3c
commit 5a50e5e02a
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
@GMS/addons/custom_server/init/build.sqf
View File

@ -1,12 +1,6 @@
private ["_version","_versionDate"]; private ["_version","_versionDate"];
<<<<<<< HEAD
blck_version = "6.80 Build 117";
_blck_version = blck_version;
_blck_versionDate = "3-3-18 7:00 PM";
=======
blck_version = "6.80 Build 118"; blck_version = "6.80 Build 118";
_blck_version = blck_version; _blck_version = blck_version;
_blck_versionDate = "3-3-18 7:00 AM"; _blck_versionDate = "3-5-18 7:00 AM";
>>>>>>> Experimental
blck_pvs_version = _blck_version; blck_pvs_version = _blck_version;
publicVariable blck_pvs_version; publicVariable blck_pvs_version;