From ceeb0208550a79870c9aa68253f7d98347059030 Mon Sep 17 00:00:00 2001
From: Jeremy <puma.rc@wanadoo.fr>
Date: Mon, 20 Apr 2020 17:22:08 +0200
Subject: [PATCH] Nettoyage de bot.py

---
 bot.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/bot.py b/bot.py
index 74e18ba..5c384bf 100755
--- a/bot.py
+++ b/bot.py
@@ -42,16 +42,6 @@ l_extensions: List[str] = [
 
 
 async def _prefix_callable(bot, message: discord.message) -> list:
-<<<<<<< HEAD
-    extras = [bot.cluster.get('Name') + '.']
-    if message.guild is not None:
-        if str(message.guild.id) in bot.prefixes:
-            extras.extend(
-                bot.prefixes.get(str(message.guild.id), "prefixes").split(
-                    bot.config.get("misc", "Separator")
-                )
-            )
-=======
     try:
         with open(f'./configs/guilds/{message.guild.id}.json', 'r') as f:
             data = json.load(f)
@@ -62,7 +52,6 @@ async def _prefix_callable(bot, message: discord.message) -> list:
 
     extras = [bot.cluster.get('Name') + '.']
     extras.extend(custom_prefix)
->>>>>>> cce7bb409303e9ad27ef4e5617d0bc9068810f13
 
     return commands.when_mentioned_or(*extras)(bot, message)