(2da6c898b) Added 'pretty' merge script

This commit is contained in:
juanjp600
2019-03-25 10:57:38 -03:00
parent 94c1b29beb
commit 991639709c
5 changed files with 224 additions and 24 deletions
@@ -31,8 +31,8 @@ namespace Barotrauma
GameMain.NetworkMember.CreateEntityEvent(this);
lastSentVolume = waterVolume;
lastSentOxygen = OxygenPercentage;
sendUpdateTimer = NetConfig.HullUpdateInterval;
}
sendUpdateTimer = NetworkUpdateInterval;
}
}
}