OOops merge conflict.

This commit is contained in:
Andrey Petrov 2014-12-13 13:47:28 -08:00
parent f2f5fa12cf
commit cc01deb4bb

View File

@ -25,7 +25,6 @@ const HELP_TEXT string = SYSTEM_MESSAGE_FORMAT + `-> Available commands:
` + RESET
const OP_HELP_TEXT string = SYSTEM_MESSAGE_FORMAT + `-> Available operator commands:
<<<<<<< HEAD
/ban $NAME - Banish a user from the chat
/kick $NAME - Kick em' out.
/op $NAME - Promote a user to server operator