summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-29 07:23:56 +0000
committerajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-29 07:23:56 +0000
commit1a5983affa7e600711f29337ea71ef2588c97ec8 (patch)
tree9c99032cdd5073df3bca0f57fb1b54b267d48f75
parent6db304307ee9f0753c9f657bf15007b7cb5551ad (diff)
downloadhercules-1a5983affa7e600711f29337ea71ef2588c97ec8.tar.gz
hercules-1a5983affa7e600711f29337ea71ef2588c97ec8.tar.bz2
hercules-1a5983affa7e600711f29337ea71ef2588c97ec8.tar.xz
hercules-1a5983affa7e600711f29337ea71ef2588c97ec8.zip
import in charcommand_athena.conf
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@854 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt5
-rw-r--r--conf-tmpl/charcommand_athena.conf2
2 files changed, 6 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 8cfda09e4..ef8c8d67a 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,9 @@
Date Added
+12/29
+ * Uncommented out import in charcommand_athena.conf, there is
+ need to have it commented (all the others ones are
+ uncommented) [Ajarn]
+
12/28
* When restarting the char-server, reset the online status
of all characters and guild-members (SVN 849) [MouseJstr]
diff --git a/conf-tmpl/charcommand_athena.conf b/conf-tmpl/charcommand_athena.conf
index 8f596860a..9ef9a988a 100644
--- a/conf-tmpl/charcommand_athena.conf
+++ b/conf-tmpl/charcommand_athena.conf
@@ -24,4 +24,4 @@ job: 60
jobchange: 60
charzeny: 60
-//import: conf/import/charcommand_conf.txt
+import: conf/import/charcommand_conf.txt