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

Add support for voice channel parties #33

Closed
wasi-master wants to merge 277 commits from master into 2.0
pull from: master
merge into: matthew:2.0
Conversation 4 Commits 277 Files Changed 45 +7201 -105
44 changed files with 7201 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2df88ccc27 - Show all commits

5
discord/embeds.py
View File

@ -534,13 +534,8 @@ class Embed:
return self
@property
<<<<<<< HEAD
def fields(self):
"""List[Union[``EmbedProxy``, :attr:`Empty`]]: Returns a :class:`list` of ``EmbedProxy`` denoting the field contents.
=======
def fields(self) -> List[_EmbedFieldProxy]:
"""Union[List[:class:`EmbedProxy`], :attr:`Empty`]: Returns a :class:`list` of ``EmbedProxy`` denoting the field contents.
>>>>>>> 523e35e4f3c3c49d4e471359f9fb559242bbecc8
See :meth:`add_field` for possible values you can access.