Fix incorrect merge conflict resolutions, lint remaining items

1 files changed, 2 insertions, 2 deletions

diff --git a/bot/seasons/easter/egghead_quiz.py b/bot/seasons/easter/egghead_quiz.py
index 0b175bf1..bd179fe2 100644
--- a/bot/seasons/easter/egghead_quiz.py
+++ b/bot/seasons/easter/egghead_quiz.py
@@ -97,13 +97,13 @@ class EggheadQuiz(commands.Cog):
 
     @staticmethod
     async def already_reacted(message: discord.Message, user: Union[discord.Member, discord.User]) -> bool:
-        """Returns whether a given user has reacted more than once to a given message"""
+        """Returns whether a given user has reacted more than once to a given message."""
         users = [u.id for reaction in [await r.users().flatten() for r in message.reactions] for u in reaction]
         return users.count(user.id) > 1  # Old reaction plus new reaction
 
     @commands.Cog.listener()
     async def on_reaction_add(self, reaction: discord.Reaction, user: Union[discord.Member, discord.User]) -> None:
-        """Listener to listen specifically for reactions of quiz messages"""
+        """Listener to listen specifically for reactions of quiz messages."""
         if user.bot:
             return
         if reaction.message.id not in self.quiz_messages: