Skip to content

Commit 33c0be5

Browse files
committed
Version Updated
1 parent 1e47598 commit 33c0be5

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
Current Version
55
==================================
6-
- DayZMod Dev-b725dcd
6+
- DayZMod V1.8.6
77

88
Files updated
99
------------

SQF/dayz_code/Configs/rscTitles.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,7 @@ class RscDisplayMain : RscStandardDisplay
370370
class DAYZ_Version : CA_Version
371371
{
372372
idc = -1;
373-
<<<<<<< HEAD
374-
text = "DayZ 1.8.5";
375-
=======
376-
text = "DayZMod Dev-b725dcd";
377-
>>>>>>> origin/Development
373+
text = "DayZMod V1.8.6";
378374
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
379375
};
380376
delete CA_TitleMainMenu;

SQF/dayz_code/config.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ class CfgMods {
1717
hidePicture = 0;
1818
hideName = 0;
1919
action = "http://www.dayzmod.com";
20-
<<<<<<< HEAD
21-
version = "DayZ 1.8.5";
22-
=======
23-
version = "DayZMod Dev-b725dcd";
24-
>>>>>>> origin/Development
20+
version = "DayZMod V1.8.6";
2521
hiveVersion = 0.96;
2622
requiredAddons[] = {"Chernarus"};
2723
};

0 commit comments

Comments
 (0)