From 5fa08da8732bd21cb67754e36c5d27958542517e Mon Sep 17 00:00:00 2001 From: KevinTrinh1227 Date: Wed, 25 Oct 2023 19:47:11 -0500 Subject: [PATCH] Update --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3269a61..8fad4c7 100644 --- a/README.md +++ b/README.md @@ -109,11 +109,7 @@ Mod commands require certain permission nodes to execute. View corresponding com | Bot Feature | Command Usage | Description | | :--------------------: | :----------------------------------: |:---------------------------------------------------------------------------------------------------------: | | Force Verification | `/forceverify <@Discord Member> ` | Force sync a discord member to a Hypixel account | -<<<<<<< HEAD -| Force Unverification | `/forceunverify <@Discord Member>` | Force unsync a discord member from a Hypixel account | -======= -| Force Unverification | `/forceunverify <@Discord Member>` | Force un-sync a discord member to a Hypixel account | ->>>>>>> refs/remotes/origin/main +| Force Unverification | `/forceunverify <@Discord Member>` | Force un-sync a discord member from a Hypixel account | | Ban Player | `/ban [@Server Member]` | Ban a player from your server. This punishment will also be logged in a specified channel | | Kick Player | `/kick [@Server Member]` | Kick a player from your server. This punishment will also be logged in a specified channel | | Purge Messages | `/purge ` | Clear a specified amount of message in that specific channel | @@ -128,7 +124,7 @@ These listeners listen for certain event triggers or run asynchronously. | Bot Feature | Description | | :-------------------------: | :---------------------------------------------------------------------------------------------------------------------------------: | | Ticket Transcripts | When tickets are closed, a ticket transcript will be sent to the user who opened the ticket, and a copy will be stored in a specified channel| -| Level & Economy System | Users gain coins and experience points by sending messages and participating in chat | +| Level & Economy System | Users gain coins and experience points by sending messages and participating in chat | | Custom Welcome Message | Sends a customizable welcome message in a specified channel | | Custom Join Private Message | Sends a customizable welcome message in a specified channel | | Leave Message Logs | Sends a log report for each member that leaves your server in a specified channel |