From 758a30a080178bf0db018016a5e42d519002a12e Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Sun, 12 Jul 2020 16:57:36 -0500
Subject: [PATCH] Fix merge

---
 zone/worldserver.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index d5d14b6cd..d4fa5e572 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -3265,5 +3265,4 @@ void WorldServer::OnKeepAlive(EQ::Timer *t)
 {
 	ServerPacket pack(ServerOP_KeepAlive, 0);
 	SendPacket(&pack);
-}
->>
\ No newline at end of file
+}
\ No newline at end of file