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

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

diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index 5ede67713..d5d14b6cd 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -1,4 +1,4 @@
-<</*	EQEMu: Everquest Server Emulator
+/*	EQEMu: Everquest Server Emulator
 Copyright (C) 2001-2016 EQEMu Development Team (http://eqemu.org)
 
 This program is free software; you can redistribute it and/or modify