summaryrefslogtreecommitdiff
path: root/data/help/commands.txt
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-12-07 20:27:00 -0700
committerIra Rice <irarice@gmail.com>2008-12-07 20:27:00 -0700
commit16d8375be2074e21ec3681c5d9b4f984e1db5687 (patch)
treec370fbd72d5128cb45662db289e0406d2f01192f /data/help/commands.txt
parentd11b55a4ad9b24d8fb6597e5b1e0eeb904bd9505 (diff)
downloadmana-client-16d8375be2074e21ec3681c5d9b4f984e1db5687.tar.gz
mana-client-16d8375be2074e21ec3681c5d9b4f984e1db5687.tar.bz2
mana-client-16d8375be2074e21ec3681c5d9b4f984e1db5687.tar.xz
mana-client-16d8375be2074e21ec3681c5d9b4f984e1db5687.zip
Fixed a few help files that got messed up a few commits ago.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'data/help/commands.txt')
-rw-r--r--data/help/commands.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/data/help/commands.txt b/data/help/commands.txt
index e80c537e..2785869c 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -48,18 +48,11 @@
/whisper <name> <message>
-<<<<<<< HEAD:data/help/commands.txt
This will send <message> to player <name>, if that player is logged in.
to whisper to users with spaces in there name you must incase the user name in qoutes
(e.g. /whisper "user name" <message>)
For further help type /help in the chat console.
-=======
- This will send <message> to player <name>, if that player is logged in. If the
- name has a space in it, put double quotes around it like this:
-
- /whisper "<name>" <message>
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/commands.txt
##2IGNORING COMMUNICATION