Fixed a few help files that got messed up a few commits ago.

Signed-off-by: Ira Rice <irarice@gmail.com>

4 files changed, 4 insertions, 87 deletions

diff --git a/data/help/changes.txt b/data/help/changes.txt
index e679e928..60e78419 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -2,75 +2,7 @@
  
  
 ##3                         === RECENT CHANGES ===
- 
-<<<<<<< HEAD:data/help/changes.txt
+
 Go to http://gitorious.org/projects/tmw/repos/aethyra for a detailed
 list of changes.
-=======
- 0.0.26 (29 August 2008)
- - Added support for a newer version of eAthena server
- - Added support for showing custom being effects
- - Added new features to the particle engine
- - Position names and chat such that there is no overlap, when possible
- - Fixed a crash when loading a corrupt map that has too much layer data
- 
- 0.0.25 (27 July 2008)
- - Added support for whispering to other players
- - Added ability to ignore other players
- - Added command line argument for specifying the update host (-H)
- - Added support for receiving the update host from the server
- - Added support for displaying a shield sprite
- - Added shortcut window, allowing you to quickly access inventory items
- - Added message when gaining money from trade or quest
- - Added support for an arbitrary number of map layers
- - Added support for basing one sprite definition on another
- - Added the possibility to assign particle effects to NPCs
- - Added remembering whether windows are visible or not
- - Updated to work with Guichan 0.8.x
- - Improved accuracy of monster targeting with the mouse
- - Page up and page down will now scroll the chat window
- - Item icons are now loaded on demand and unloaded when no longer used
- - Fixed display of critical hits
- - Fixed multi-channel image dyeing
- - Fixed updating of money display after buying
- 
- 0.0.24.1 (7 April 2008)
- - Added /clear command to clear chat window
- - Added ability to close quit dialog by pressing ESC
- - Added key for targetting nearest player
- - Added the possibility to assign particle effects to monsters
- - Added possibility to pass through players with key controls
- - Fixed crash on exit after connection to server was lost
- - Fixed initialization of some variables
- - Fixed an error with chat messages without a sender that include a colon
- - Fixed minimap to not keep reappearing when hidden
- - Fixed a GCC 4.3 compile error
- - Fixed music loading from non-default location
- - Fixed crash on trying to show out of range emoticon
- - Updated Dev-C++ and Code::Blocks project files
- 
- 0.0.24 (24 December 2007)
- - Added female specific hair styles
- - Added user-definable key settings
- - Added XP gaining notification
- - Added close button to most windows
- - Added support for dynamic sprite recoloring
- - Added notification when the connection to the server is lost
- - Updated to work with Guichan 0.7.x
- - Mouse cursor now indicates when resize is possible
- - Changed amount slider in buy and sell dialogs to start at 1
- - Made weapon sprites and sounds customizable
- - Made buy and sell dialogs resizable
- - Merged equipment database with items database
- - Chat window log no longer goes back forever
- - Chat messages are trimmed (spaces are removed on both sides)
- - Fixed segmentation fault with some OpenGL drivers
- - Fixed updating of defense when increasing vitality
- - Fixed a bug that prevented being-controlled particles from being deleted
- - Fixed a crash in the particle engine related to child emitters
- - Fixed encoding issues with user home directory
- - Fixed a crash in equipment window on failure to load an item icon
- - Fixed a crash on filling up your inventory
- - Fixed item list in shops not to scroll back when selling
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/changes.txt
- 
+
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
diff --git a/data/help/header.txt b/data/help/header.txt
index a560895c..f70426fe 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -1,12 +1,8 @@
  
 ##1                                 AETHYRA
 ##1               ==========================================
- 
-<<<<<<< HEAD:data/help/header.txt
-           ##2Version:##6 Aethyra GIT 0.0.27              ##2Date:##5 December 2008
-=======
-           ##2Version:##6 0.0.26              ##2Date:##329 August 2008
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/header.txt
+
+           ##2Version:##6 Aethyra GIT 0.0.27              ##2Date:##7 December 2008
  
 ##2                    Website: http://www.aethyra.org
  
diff --git a/data/help/support.txt b/data/help/support.txt
index 819516de..44fd08f3 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -7,11 +7,7 @@
  can't find a solution to your problem, feel free to check our
  Bugs/Support section of the forum:
  
-<<<<<<< HEAD:data/help/support.txt
 ##2     http://forums.aethyra.com
-=======
-##2     http://forums.themanaworld.org/viewforum.php?f=3
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/support.txt
  
  or come visit us on our IRC channel: