From 38711cded6386b372e2d1ea1dff662aa49d27c23 Mon Sep 17 00:00:00 2001 From: rburchell Date: Sun, 15 Feb 2009 15:24:51 +0000 Subject: [PATCH] Merge master into svsopers. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2071 5417fbe8-f217-4b02-8779-1006273d7864 --- src/core/bs_assign.c | 5 ----- 1 file changed, 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;