From f59b607b65072cf8bc37a143dfef1904106a2229 Mon Sep 17 00:00:00 2001
From: LBlend <lblend@protonmail.com>
Date: Fri, 26 Mar 2021 17:05:59 +0100
Subject: [PATCH] fixed merge conflicts

---
 src/cogs/funreplies.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/cogs/funreplies.py b/src/cogs/funreplies.py
index b3cd0cc..6f19a8c 100644
--- a/src/cogs/funreplies.py
+++ b/src/cogs/funreplies.py
@@ -18,15 +18,10 @@ class FunReplies(commands.Cog):
             await message.channel.send('Jeg vet hvem som drepte Olof Palme 👀')
 
         #  The Ultimate spaghetti
-<<<<<<< HEAD
         elif re.match(r'(\W|\s)*lesgo{1}(\s|\W)*', message.clean_content.lower()) or \
             message.clean_content.lower() == 'lesgo':
             await message.channel.send('https://cdn.discordapp.com/attachments/750052141346979850/' +
                                        '824764933513281596/3xhpwbakz2361.png')
-=======
-        elif re.match(r'(\W|\s)*lesgo{1}(\s|\W)*', message.clean_content.lower()) or message.clean_content.lower() == 'lesgo':
-            await message.channel.send('https://cdn.discordapp.com/attachments/750052141346979850/824764933513281596/3xhpwbakz2361.png')
->>>>>>> 0145bbfd78140aa14e79be6d0aee2231c011b15f
 
 
 def setup(bot):