mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-27 04:41:23 +00:00
Fix improperly-resolved merge conflict
This commit is contained in:
parent
d58cb1aae3
commit
416b723567
1 changed files with 0 additions and 1 deletions
|
@ -5099,7 +5099,6 @@ static inline void PingUpdate(void)
|
||||||
if (pingtimeout[i] > cv_pingtimeout.value) // ok your net has been bad for too long, you deserve to die.
|
if (pingtimeout[i] > cv_pingtimeout.value) // ok your net has been bad for too long, you deserve to die.
|
||||||
{
|
{
|
||||||
XBOXSTATIC char buf[2];
|
XBOXSTATIC char buf[2];
|
||||||
pingtimeout[i] = 0;
|
|
||||||
|
|
||||||
pingtimeout[i] = 0;
|
pingtimeout[i] = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue