pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 13:53:12 +02:00
Code Activity

Merge master into svsopers.

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2071 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
rburchell
2009-02-15 15:24:51 +00:00
parent 550e371f10
commit 38711cded6
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/bs_assign.c
-5
View File
@@ -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;