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

Resolved conflicts

Browse Source
This commit is contained in:
Ghostrider [GRG] 2020-11-07 09:52:20 -05:00 committed by GitHub
parent dc82f9a362
commit 4d56107e15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 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,10 +1,6 @@
<<<<<<< Updated upstream
#define blck_buildNumber 230 // Address issues with cleanup of objects
#define blck_versionNumber 7.02
#define blck_buildDate "10-5-20"
=======
#define blck_buildNumber 232 // Address issues with cleanup of objects #define blck_buildNumber 232 // Address issues with cleanup of objects
#define blck_versionNumber 7.03 #define blck_versionNumber 7.03
#define blck_buildDate "10-12-20" #define blck_buildDate "10-12-20"
>>>>>>> Stashed changes