Fixed duplicate keys

2004-08-22 04:25:55 +00:00
parent 3a78aff06d
commit a9cb464a33
10 changed files with 20 additions and 102 deletions
--- a/plugins/admin.sma
+++ b/plugins/admin.sma
@ -37,9 +37,15 @@

 #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