Fix merge

This commit is contained in:
Akkadius committed 2020-07-12 16:57:04 -05:00
1 parent 8647bd73ce
commit 3016f9409b
1 file changed
+1 -1
+1 -1
View File
@@ -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