matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
iDutchy
2021-06-25 20:33:22 -05:00
parent 34f6c5db10 462ba84809
commit 2a32e56873
7 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/api.rst
View File

@@ -267,7 +267,7 @@ to handle it, which defaults to print a traceback and ignoring the exception.
If you want exception to propagate out of the :class:`Client` class
you can define an ``on_error`` handler consisting of a single empty
:ref:`py:raise`. Exceptions raised by ``on_error`` will not be
:ref:`raise statement <py:raise>`. Exceptions raised by ``on_error`` will not be
handled in any way by :class:`Client`.
.. note::
@@ -834,7 +834,7 @@ to handle it, which defaults to print a traceback and ignoring the exception.
:type member: :class:`Member`
:param before: The voice state prior to the changes.
:type before: :class:`VoiceState`
:param after: The voice state after to the changes.
:param after: The voice state after the changes.
:type after: :class:`VoiceState`
.. function:: on_member_ban(guild, user)