mirror of
https://github.com/brandons209/Red-bot-Cogs.git
synced 2024-05-19 20:03:17 +12:00
oof
This commit is contained in:
parent
393548f32e
commit
18f1efb474
|
@ -219,11 +219,7 @@ class Welcome(getattr(commands, "Cog", object)):
|
|||
"").format(channel)
|
||||
)
|
||||
|
||||
<<<<<<< HEAD
|
||||
@welcomeset.command(name='ban-channel')
|
||||
=======
|
||||
@welcomeset.command(name='channel')
|
||||
>>>>>>> 564a96b68d4c483315280c0da50e22ae8fcf44ba
|
||||
async def welcomeset_channel(self, ctx: commands.Context, channel: discord.TextChannel):
|
||||
"""Sets the channel to be used for event notices."""
|
||||
|
||||
|
|
Loading…
Reference in a new issue