Fix merge conflict
This commit is contained in:
parent
f1d7d353b5
commit
a6d6472c79
@ -146,11 +146,13 @@ class BotBase(GroupMixin):
|
|||||||
def __init__(self,
|
def __init__(self,
|
||||||
command_prefix,
|
command_prefix,
|
||||||
help_command=_default,
|
help_command=_default,
|
||||||
description=None,
|
description=None, *,
|
||||||
|
intents: discord.Intents,
|
||||||
message_commands: bool = True,
|
message_commands: bool = True,
|
||||||
slash_commands: bool = False, **options
|
slash_commands: bool = False, **options
|
||||||
):
|
):
|
||||||
super().__init__(**options)
|
super().__init__(**options, intents=intents)
|
||||||
|
|
||||||
self.command_prefix = command_prefix
|
self.command_prefix = command_prefix
|
||||||
self.slash_commands = slash_commands
|
self.slash_commands = slash_commands
|
||||||
self.message_commands = message_commands
|
self.message_commands = message_commands
|
||||||
|
Loading…
x
Reference in New Issue
Block a user