From 9863c0765a858ea362eb8dc2185ae7063fe38b93 Mon Sep 17 00:00:00 2001
From: icomrade <icomrade@live.com>
Date: Fri, 4 Mar 2016 15:23:22 -0500
Subject: [PATCH] Pointless merge conflict

---
 SQF/dayz_code/compile/fn_unconscious.sqf | 37 ------------------------
 1 file changed, 37 deletions(-)

diff --git a/SQF/dayz_code/compile/fn_unconscious.sqf b/SQF/dayz_code/compile/fn_unconscious.sqf
index 6b38e9440..5dcc872d7 100644
--- a/SQF/dayz_code/compile/fn_unconscious.sqf
+++ b/SQF/dayz_code/compile/fn_unconscious.sqf
@@ -14,7 +14,6 @@ r_player_unconsciousInProgress = true;
 			default { 0 }; // bare hands / flare
 		}
 	};
-<<<<<<< HEAD
 	_sprint = if (count _anim <= 10) then { false } else { _anim select 10 in [112, 118] };
 	_stance = if (count _anim <= 5) then { 2 } else {
 		switch (_anim select 5) do {
@@ -22,42 +21,6 @@ r_player_unconsciousInProgress = true;
 			case 112 : { 0 }; // prone
 			default { 2 }; // erected
 		}
-=======
-	"dynamicBlur" ppEffectEnable true;"dynamicBlur" ppEffectAdjust [2]; "dynamicBlur" ppEffectCommit 0;
-	"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, 0.1],  [1, 1, 1, 0.0]];"colorCorrections" ppEffectCommit 0;
-	0 fadeSound 0.05;
-	disableUserInput true;
-	_disableHdlr = [] spawn { uiSleep 2; disableUserInput true; r_player_unconsciousInputDisabled = true; };
-	autoRunActive = 0;
-	while {r_player_unconscious} do {
-		_ctrl1 ctrlSetPosition [(_ctrl1Pos select 0),(_ctrl1Pos select 1),(_ctrl1Pos select 2),((0.136829 * safezoneH) * (1 -(r_player_timeout / _totalTimeout)))];
-		_ctrl1 ctrlCommit 1;
-		playSound "heartbeat_1";
-		uiSleep 1;
-		_bloodLow = ((r_player_blood/r_player_bloodTotal) < 0.5);
-		
-		if(_timeout == 0) then {
-			if (!r_player_dead && !_bloodLow && r_player_injured) then {
-				_timeout = 10;
-			};
-		} else {
-			_timeout = _timeout - 1;
-		};
-		
-		if (r_player_timeout > 0) then {
-			r_player_timeout = r_player_timeout - 1;
-		} else {
-			if (!r_player_dead) then {
-				_nul = [] spawn fnc_usec_recoverUncons;
-			};
-		};
-		if (!(player getVariable ["NORRN_unconscious", true])) then {
-			_nul = [] spawn fnc_usec_recoverUncons;
-		};
-		if(animationState player == "AmovPpneMstpSnonWnonDnon_healed") then {
-			_nul = [] spawn fnc_usec_recoverUncons;
-		};
->>>>>>> upstream/master
 	};
 
 	_transmove = (switch true do {