fix conflicts

2019-02-16 10:44:35 -08:00 · 2019-02-16 10:44:35 -08:00 · a1216710d3
parent 416010aa7b
commit a1216710d3
1 changed files with 1 additions and 1 deletions
--- 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()