summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a21bb930..9253d68e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,7 +72,6 @@
Added unregistering, checking on character's name and email
length support. Also made some little tweaks.
->>>>>>> 1.25
2005-12-10 Yohann Ferreira <bertram@cegetel.net>
* src/dalstorage.cpp: Fixed the buggy part of getAccount()