Fix merge

This commit is contained in:
Akkadius
2020-07-12 16:57:36 -05:00
parent 3016f9409b
commit 758a30a080
-1
View File
@@ -3266,4 +3266,3 @@ void WorldServer::OnKeepAlive(EQ::Timer *t)
ServerPacket pack(ServerOP_KeepAlive, 0); ServerPacket pack(ServerOP_KeepAlive, 0);
SendPacket(&pack); SendPacket(&pack);
} }
>>