Corrected Typos due to resolution of confilcts between branches.
This commit is contained in:
parent
c29d518f3c
commit
5a50e5e02a
@ -1,12 +1,6 @@
|
||||
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 = blck_version;
|
||||
_blck_versionDate = "3-3-18 7:00 AM";
|
||||
>>>>>>> Experimental
|
||||
_blck_versionDate = "3-5-18 7:00 AM";
|
||||
blck_pvs_version = _blck_version;
|
||||
publicVariable blck_pvs_version;
|
||||
|
Loading…
Reference in New Issue
Block a user