diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/bs_assign.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index da8eaa6b3..113183b24 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -66,13 +66,8 @@ class CommandBSAssign : public Command notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan); return MOD_CONT; } -<<<<<<< HEAD:src/core/bs_assign.c - if ((ci->botflags & BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u))) -======= - if ((ci->botflags & BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->na->nc->HasCommand("botserv/administration"))) ->>>>>>> Set required command string for botserv modules.:src/core/bs_assign.c { notice_lang(s_BotServ, u, PERMISSION_DENIED); return MOD_CONT; |