diff options
Diffstat (limited to 'bot')
| -rw-r--r-- | bot/cogs/candy_collection.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bot/cogs/candy_collection.py b/bot/cogs/candy_collection.py index 63ce9cb6..8eb6ddf9 100644 --- a/bot/cogs/candy_collection.py +++ b/bot/cogs/candy_collection.py @@ -156,11 +156,7 @@ class CandyCollection: pass async def send_spook_msg(self, author, channel, candies): -<<<<<<< HEAD """Send a spooky message""" -======= - """Send a (lame) spooky message""" ->>>>>>> 4c29c2b470d6f27416a97c3be1e41f753e0a1ea6 e = discord.Embed(colour=author.colour) e.set_author(name="Ghosts and Ghouls and Jack o' lanterns at night; " f"I took {candies} candies and quickly took flight.") |