Fix improperly-resolved merge conflict

This commit is contained in:
fickleheart 2019-03-09 21:08:29 -06:00
parent d58cb1aae3
commit 416b723567

View file

@ -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.
{
XBOXSTATIC char buf[2];
pingtimeout[i] = 0;
pingtimeout[i] = 0;