Quick merge conflict fix
This commit is contained in:
parent
809f093ca3
commit
8df08bc5ff
@ -28,7 +28,7 @@ async def userinfo(ctx: commands.Context, user: discord.User):
|
|||||||
user_id = user.id
|
user_id = user.id
|
||||||
username = user.name
|
username = user.name
|
||||||
avatar = user.display_avatar.url
|
avatar = user.display_avatar.url
|
||||||
await ctx.send(f'User found: {user_id} -- {username}\n{avatar}')
|
await ctx.send(f"User found: {user_id} -- {username}\n{avatar}")
|
||||||
|
|
||||||
@userinfo.error
|
@userinfo.error
|
||||||
async def userinfo_error(ctx: commands.Context, error: commands.CommandError):
|
async def userinfo_error(ctx: commands.Context, error: commands.CommandError):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user