UiO-Gaming/mustafa
1
0 Fork 0
mirror of https://github.com/UiO-Gaming/mustafa.git synced 2026-11-05 13:56:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
LBlend committed 2021-03-26 17:05:59 +01:00
1 parent 87302514e6
commit f59b607b65
1 file changed
-5
Download Patch File Download Diff File Expand all files Collapse all files
src/cogs/funreplies.py
-5
View File
@@ -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):