From 613a08c770d3d044cd3c68241475a7bb55baf53b Mon Sep 17 00:00:00 2001
From: RimBlock <RimBlock-xbl@hotmail.com>
Date: Thu, 24 Jul 2014 21:00:41 +0800
Subject: [PATCH] no message

---
 .../Configs/CfgVehicles/AIR/CH53.hpp          | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
index b969a75a9..b18f56d67 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
@@ -27,23 +27,5 @@ class CH53_DZE : USEC_ch53_E {
 	transportMaxWeapons = 25;
 	transportMaxMagazines = 80;
 	transportmaxbackpacks = 15;
-<<<<<<< HEAD
 	fuelCapacity = 3849;
-	
-	class Turrets : Turrets  {
-		class MainTurret : MainTurret  {
-			magazines[] = {"2000Rnd_762x51_M134"};
-		};
-	};
-};
-class CH53_DZE: CH53_DZ	 {
-	displaynameshort = "CH53_DZE";
-	class Turrets : Turrets  {
-		class MainTurret : MainTurret  {
-			magazines[] = {""};
-		};
-	};
-};
-=======
-};
->>>>>>> 41c658c0c8b8f580c5b137ea22830ac81c2123e6
+};
\ No newline at end of file