fix(statusrotator): update status messages and fix merge conflicts
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user