manual merge

This commit is contained in:
commy2 2016-05-18 12:21:53 +02:00
parent 230f0ab85e
commit 25876d82ca

View File

@ -386,7 +386,6 @@ GVAR(OldIsCamera) = false;
if !(_data isEqualTo GVAR(OldPlayerInventory)) then {
// Raise ACE event locally
GVAR(OldPlayerInventory) = _data;
<<<<<<< HEAD
// we don't want to trigger this just because your ammo counter decreased.
_data = + GVAR(OldPlayerInventory);