Fix merge

This commit is contained in:
Akkadius 2020-07-12 16:57:36 -05:00
parent 3016f9409b
commit 758a30a080

View File

@ -3265,5 +3265,4 @@ void WorldServer::OnKeepAlive(EQ::Timer *t)
{
ServerPacket pack(ServerOP_KeepAlive, 0);
SendPacket(&pack);
}
>>
}