From a1216710d3d4e3ea3ca3fac05e1c9314f34ebf3b Mon Sep 17 00:00:00 2001 From: Mal Hancock Date: Sat, 16 Feb 2019 10:44:35 -0800 Subject: [PATCH] fix conflicts --- pinhook/bot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinhook/bot.py b/pinhook/bot.py index 026a3a3..966c1d7 100644 --- a/pinhook/bot.py +++ b/pinhook/bot.py @@ -148,7 +148,7 @@ class Bot(irc.bot.SingleServerIRCBot): c.quit("See y'all later!") quit() elif cmd == self.cmd_prefix + 'help': - output = self.call_help() + output = self.call_help(op) elif cmd == self.cmd_prefix + 'reload' and op: self.logger.info('reloading plugins per request of {}'.format(nick)) self.load_plugins()