From 2df88ccc279d13ea5264e172890f9673aff6335d Mon Sep 17 00:00:00 2001
From: iDutchy <speedyniels@gmail.com>
Date: Fri, 25 Jun 2021 21:07:02 -0500
Subject: [PATCH] Apparently a conflict sneaked through

---
 discord/embeds.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/discord/embeds.py b/discord/embeds.py
index ff9afd10..32331f5d 100644
--- a/discord/embeds.py
+++ b/discord/embeds.py
@@ -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.