Version Updated

DayZMod · May 28, 2015 · 33c0be5 · 33c0be5
1 parent 1e47598
commit 33c0be5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 Current Version
 ==================================
- - DayZMod Dev-b725dcd
+ - DayZMod V1.8.6
 
 Files updated
 ------------

diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp
@@ -370,11 +370,7 @@ class RscDisplayMain : RscStandardDisplay
 		class DAYZ_Version : CA_Version
 		{
 			idc = -1;
-<<<<<<< HEAD
-			text = "DayZ 1.8.5";
-=======
-			text = "DayZMod Dev-b725dcd";
->>>>>>> origin/Development
+			text = "DayZMod V1.8.6";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		delete CA_TitleMainMenu;

diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp
@@ -17,11 +17,7 @@ class CfgMods {
 		hidePicture = 0;
 		hideName = 0;
 		action = "http://www.dayzmod.com";
-<<<<<<< HEAD
-		version = "DayZ 1.8.5";
-=======
-		version = "DayZMod Dev-b725dcd";
->>>>>>> origin/Development
+		version = "DayZMod V1.8.6";
 		hiveVersion = 0.96;
 		requiredAddons[] = {"Chernarus"};
 	};