From 5a50e5e02ab8c3145d3897297f0e75bed0fe95cf Mon Sep 17 00:00:00 2001
From: Ghostrider-GRG- <cardocp@hotmail.com>
Date: Mon, 5 Mar 2018 20:53:49 -0500
Subject: [PATCH] Corrected Typos due to resolution of confilcts between
 branches.

---
 @GMS/addons/custom_server/init/build.sqf | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/@GMS/addons/custom_server/init/build.sqf b/@GMS/addons/custom_server/init/build.sqf
index af70ecc..0db7ca8 100644
--- a/@GMS/addons/custom_server/init/build.sqf
+++ b/@GMS/addons/custom_server/init/build.sqf
@@ -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;