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

Apparently a conflict sneaked through

Browse Source
This commit is contained in:
iDutchy 2021-06-25 21:07:02 -05:00
parent 0f3b15f10d
commit 2df88ccc27
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
discord/embeds.py
View File

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