Merge branch 'main' of dumtaxat-git:/boyan_k/custoMM

discord_bot.py

@@ -157,9 +157,7 @@ async def register(ctx, *args):
     name = " ".join(args)
     print(name)
     league_name = requests.get(f"{URL}/players/{name}").json()
-<<<<<<< HEAD
     print(league_name)
-=======
 
     try:
         if not league_name["detail"] == "Not found.":
@@ -167,7 +165,6 @@ async def register(ctx, *args):
     except KeyError:
         if league_name["discord_id"]:
             return await ctx.send(f"{league_name['discord']} has claimed this account.")
->>>>>>> 724a78ec70c1093baf80abc93712303e1291cc94
 
     claim_account = requests.post(f"{URL}/players/", data={
         "discord": ctx.author.name,