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 <amxmisc>
<<<<<<< admin.sma
#include <amxconst>
#include <string>
#include <file>
=======
#if defined USING_SQL
#include <dbi>
#endif
>>>>>>> 1.25
#define MAX_ADMINS 64
@ -353,4 +347,4 @@ public ackSignal(id) {
}
public client_authorized(id)
return get_cvar_num( "amx_mode" ) ? accessUser( id ) : PLUGIN_CONTINUE
return get_cvar_num( "amx_mode" ) ? accessUser( id ) : PLUGIN_CONTINUE