diff options
| author | Ira Rice <irarice@gmail.com> | 2008-12-07 20:27:00 -0700 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-12-07 20:27:00 -0700 |
| commit | 16d8375be2074e21ec3681c5d9b4f984e1db5687 (patch) | |
| tree | c370fbd72d5128cb45662db289e0406d2f01192f /data/help/header.txt | |
| parent | d11b55a4ad9b24d8fb6597e5b1e0eeb904bd9505 (diff) | |
| download | mana-16d8375be2074e21ec3681c5d9b4f984e1db5687.tar.gz mana-16d8375be2074e21ec3681c5d9b4f984e1db5687.tar.bz2 mana-16d8375be2074e21ec3681c5d9b4f984e1db5687.tar.xz mana-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/header.txt')
| -rw-r--r-- | data/help/header.txt | 8 |
1 files changed, 2 insertions, 6 deletions
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 |