fix merge conflict

2020-11-24 17:19:31 -06:00
parent 777c95aab2 5bad633987
commit 6e024871ec
22 changed files with 448 additions and 64 deletions
--- a/discord/abc.py
+++ b/discord/abc.py
@ -713,7 +713,7 @@ class GuildChannel:
    async def create_invite(self, *, reason=None, **fields):
        """|coro|

-        Creates an instant invite.
+        Creates an instant invite from a text or voice channel.

        You must have the :attr:`~Permissions.create_instant_invite` permission to
        do this.
@ -741,6 +741,9 @@ class GuildChannel:
        ~discord.HTTPException
            Invite creation failed.

+        ~discord.NotFound
+            The channel that was passed is a category or an invalid channel.
+
        Returns
        --------
        :class:`~discord.Invite`