Fix merge conflict

2021-09-01 17:45:25 +01:00 · 2021-09-01 17:45:25 +01:00 · a6d6472c79
commit a6d6472c79
parent f1d7d353b5
1 changed files with 4 additions and 2 deletions
--- 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