From 7d509920235861e3e61ee7505c6f3fb24404ca82 Mon Sep 17 00:00:00 2001
From: Zevaryx <zevaryx@gmail.com>
Date: Tue, 20 Jul 2021 08:43:35 -0600
Subject: [PATCH 1/2] Fix bad merge headers remaining in file

---
 jarvis/__init__.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/jarvis/__init__.py b/jarvis/__init__.py
index da05ec4..cc2f332 100644
--- a/jarvis/__init__.py
+++ b/jarvis/__init__.py
@@ -194,25 +194,15 @@ async def on_message(message: Message):
         if autopurge:
             await message.delete(delay=autopurge["delay"])
         content = re.sub(r"\s+", "", message.content)
-<<<<<<< HEAD
         content = re.sub(r"[^\w\d./]+", "", content)
         match = invites.search(content)
         if match:
-=======
-        content = re.sub(r"[^\w\s]", "", content)
-        matches = invites.match(content)
-        if matches:
->>>>>>> d2cf3549ece5640fd7e215a75e12421c8f19fa10
             guild_invites = await message.guild.invites()
             allowed = [x.code for x in guild_invites] + [
                 "dbrand",
                 "VtgZntXcnZ",
             ]
-<<<<<<< HEAD
             if match.group(6) not in allowed:
-=======
-            if matches.group(6) not in allowed:
->>>>>>> d2cf3549ece5640fd7e215a75e12421c8f19fa10
                 await message.delete()
                 db.jarvis.warns.insert_one(
                     {

From 6bf06bf6ca1433646f6a4feb4bbc26e8da83fb2c Mon Sep 17 00:00:00 2001
From: Zevaryx <zevaryx@gmail.com>
Date: Tue, 20 Jul 2021 08:43:51 -0600
Subject: [PATCH 2/2] Bump version to 1.0.1

---
 jarvis/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jarvis/__init__.py b/jarvis/__init__.py
index cc2f332..953ec4d 100644
--- a/jarvis/__init__.py
+++ b/jarvis/__init__.py
@@ -35,7 +35,7 @@ jarvis = commands.Bot(
 )
 slash = SlashCommand(jarvis, sync_commands=True, sync_on_cog_reload=True)
 jarvis_self = Process()
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 
 
 db = DBManager(get_config().mongo).mongo