From 33c0be5e8ebc45e7bcdf9c9ca58d9534cc178008 Mon Sep 17 00:00:00 2001
From: Carl <r4z0r49@gmail.com>
Date: Thu, 28 May 2015 07:35:47 +0100
Subject: [PATCH] Version Updated

---
 README.md                           | 2 +-
 SQF/dayz_code/Configs/rscTitles.hpp | 6 +-----
 SQF/dayz_code/config.cpp            | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 54ba1c05..0a17973e 100644
--- 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
index ae2036d2..db0be26a 100644
--- 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
index e59ddf56..bc055e59 100644
--- 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"};
 	};