fix(statusrotator): update status messages and fix merge conflicts

This commit is contained in:
zv
2026-05-06 21:01:56 +02:00
parent d045ce0fb4
commit 68c9a68fd9
3 changed files with 1 additions and 29 deletions

View File

@@ -2,8 +2,4 @@ from .statusrotator import StatusRotator
async def setup(bot):
<<<<<<< HEAD
await bot.add_cog(StatusRotator(bot))
=======
await bot.add_cog(StatusRotator(bot))
>>>>>>> a9c6c65 (feat(statusrotator): change the statuses)