diff options
Diffstat (limited to 'data/help/header.txt')
| -rw-r--r-- | data/help/header.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/help/header.txt b/data/help/header.txt index 789e3d93..a560895c 100644 --- a/data/help/header.txt +++ b/data/help/header.txt @@ -2,7 +2,11 @@ ##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 ##2 Website: http://www.aethyra.org |