fixed bad merge?

This commit is contained in:
David Anderson 2004-08-22 09:47:40 +00:00
parent 72a7e9d849
commit 1cfd5a587a

View File

@ -37,15 +37,9 @@
#include <amxmodx> #include <amxmodx>
#include <amxmisc> #include <amxmisc>
<<<<<<< admin.sma
#include <amxconst>
#include <string>
#include <file>
=======
#if defined USING_SQL #if defined USING_SQL
#include <dbi> #include <dbi>
#endif #endif
>>>>>>> 1.25
#define MAX_ADMINS 64 #define MAX_ADMINS 64