From a6d6472c79fa50bd95c7133476d3565f2a82bf58 Mon Sep 17 00:00:00 2001 From: Gnome Date: Wed, 1 Sep 2021 17:45:25 +0100 Subject: [PATCH] Fix merge conflict --- discord/ext/commands/bot.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/discord/ext/commands/bot.py b/discord/ext/commands/bot.py index 75ca3e2d..2bda7313 100644 --- a/discord/ext/commands/bot.py +++ b/discord/ext/commands/bot.py @@ -146,11 +146,13 @@ class BotBase(GroupMixin): def __init__(self, command_prefix, help_command=_default, - description=None, + description=None, *, + intents: discord.Intents, message_commands: bool = True, slash_commands: bool = False, **options ): - super().__init__(**options) + super().__init__(**options, intents=intents) + self.command_prefix = command_prefix self.slash_commands = slash_commands self.message_commands = message_commands