diff options
| author | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-02-15 15:24:51 +0000 |
|---|---|---|
| committer | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-02-15 15:24:51 +0000 |
| commit | 38711cded6386b372e2d1ea1dff662aa49d27c23 (patch) | |
| tree | dca838d2284caee44df58f12ba48b63a3c985e19 /src | |
| parent | 550e371f10d8441dc9ccacdb4f641a607cb52c2b (diff) | |
Merge master into svsopers.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2071 5417fbe8-f217-4b02-8779-1006273d7864
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; |