conflict fix

2020-10-28 21:00:48 -05:00
parent c223d2e723 abe54f5bdc
commit dea09cb5b3
33 changed files with 12183 additions and 3671 deletions
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -773,7 +773,7 @@ to handle it, which defaults to print a traceback and ignoring the exception.
    Called when a guild becomes available or unavailable. The guild must have
    existed in the :attr:`Client.guilds` cache.

-    This requires :attr:`Intents.emojis` to be enabled.
+    This requires :attr:`Intents.guilds` to be enabled.

    :param guild: The :class:`Guild` that has changed availability.