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

README.md

@@ -7,32 +7,21 @@ Cog for Red-DiscordBot that rotates the bot's playing status in a simple timed l
 - Sets the bot activity to:
   - `❓ Prefix: .help` for 60 seconds
 - Then changes it to:
-<<<<<<< HEAD
-  - `💻 I support 100+ commands` for 30 seconds
-- Repeats this cycle forever in a loop
-- Uses only `Playing` activity for both statuses
-=======
   - `🌐 nexa.zvcloud.net` for 60 seconds
 - Then changes it to:
   - `💻 I support 850+ commands` for 30 seconds
 - Repeats this cycle forever in a loop
 - Uses only `Playing` activity for all statuses
 - Sets the bot status to `Do Not Disturb`
->>>>>>> a9c6c65 (feat(statusrotator): change the statuses)
 
 ## Rotation order
 
 The status loop works like this:
 
 1. `❓ Prefix: .help` for 60 seconds
-<<<<<<< HEAD
-2. `💻 I support 100+ commands` for 30 seconds
-3. Repeat from the beginning
-=======
 2. `🌐 nexa.zvcloud.net` for 60 seconds
 3. `💻 I support 850+ commands` for 30 seconds
 4. Repeat from the beginning
->>>>>>> a9c6c65 (feat(statusrotator): change the statuses)
 
 ## Installation
 
@@ -40,9 +29,5 @@ The status loop works like this:
 2. In Discord:
 
 ```text
-<<<<<<< HEAD
-[p]load statusrotator
-=======
 [p]load statusrotator
 ```
->>>>>>> a9c6c65 (feat(statusrotator): change the statuses)

__init__.py

@@ -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)

statusrotator.py

@@ -26,20 +26,12 @@ class StatusRotator(commands.Cog):
 
         while not self.bot.is_closed():
             await self.bot.change_presence(
-<<<<<<< HEAD
-=======
                 status=discord.Status.dnd,
->>>>>>> a9c6c65 (feat(statusrotator): change the statuses)
                 activity=discord.Game(name="❓ Prefix: .help")
             )
             await asyncio.sleep(60)
 
             await self.bot.change_presence(
-<<<<<<< HEAD
-                activity=discord.Game(name="💻 I support 100+ commands")
-            )
-            await asyncio.sleep(30)
-=======
                 status=discord.Status.dnd,
                 activity=discord.Game(name="🌐 nexa.zvcloud.net")
             )
@@ -47,7 +39,6 @@ class StatusRotator(commands.Cog):
 
             await self.bot.change_presence(
                 status=discord.Status.dnd,
-                activity=discord.Game(name="💻 I support 1200+ commands")
+                activity=discord.Game(name="💻 I support 850+ commands")
             )
             await asyncio.sleep(30)
->>>>>>> a9c6c65 (feat(statusrotator): change the statuses)