1
Fork 0
mirror of https://github.com/allthingslinux/tux.git synced 2024-10-02 16:43:12 +00:00

Fixed GH somehow adding commit information in a source code file (WTF?)

This commit is contained in:
rm-rf-omega 2024-09-22 00:43:47 +02:00
parent 19f51c2685
commit 1ef9ee6637

View file

@ -1,15 +1,11 @@
import asyncio
<<<<<<< HEAD
from collections import defaultdict
from time import time
=======
from typing import DefaultDict
from tux.utils.constants import Constants as CONST
from tux.bot import Tux
>>>>>>> 28393dc (Make Pyright a bit happier about my code)
import discord
from discord.ext import commands, tasks
from loguru import logger