1.0.2.14

SQF/dayz_code/compile/fn_lightFunctions.sqf

@@ -87,15 +87,4 @@ _nrTLs= position _twr nearObjects ["#lightpoint",30];
 			};
 		};
 	};
-};
-<<<<<<< HEAD
-=======
-
-axe_TestMoveHC={
-private ["_startPos","_currPos"];
-_currPos = _this select 0;
-_startPos = [_currPos,50,180,20,0,800,0] call BIS_fnc_findSafePos;
-player setPosATL _startPos;
-};
-
->>>>>>> origin/master
+};

SQF/dayz_code/compile/local_lights_house.sqf

@@ -46,4 +46,4 @@ if(!isNil "_objHouse")then{
 			};
 		};
 	} forEach _objHouse;
-};
+};

SQF/dayz_code/compile/local_lights_init.sqf

@@ -104,4 +104,4 @@ do
 		}forEach _lightTrig;	
 	};	
 sleep _sleep;
-};
+};

SQF/dayz_code/compile/local_lights_off.sqf

@@ -69,4 +69,4 @@ if(_cntNrGen>0)then{//reset house if gen nearby to help create reliability regar
 	_x setVariable ["axeHLight", 0, false];
 	};
 }forEach _objHouses;
-*/
+*/

SQF/dayz_code/compile/local_lights_street.sqf

@@ -20,4 +20,4 @@ if(!isNil "_streetLamps")then{
 		};
 		
 	}forEach _streetLamps;
-};
+};

SQF/dayz_code/compile/local_lights_tower.sqf

@@ -17,4 +17,4 @@ if(count _nrTowers >0)then{
 		_x setVariable ["axeTLight", 1, false];
 		};	
 	}forEach _nrTowers;	
-};
+};