mirror of
https://github.com/alliedmodders/amxmodx.git
synced 2024-12-25 06:15:37 +03:00
fixed bad merge?
This commit is contained in:
parent
72a7e9d849
commit
1cfd5a587a
@ -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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user