diff options
author | Jared Adams <jaxad0127@gmail.com> | 2008-11-13 18:15:23 +0000 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2008-11-13 18:15:23 +0000 |
commit | 6f11fba50c92d937689646dc9ef4bfbf63da0fa3 (patch) | |
tree | ae325ae391803215f46d8aa934eb4e84e71dee24 /conf/char_athena.conf | |
parent | f9d96008eca02f9b60076221cba77b83a3631f33 (diff) | |
download | serverdata-6f11fba50c92d937689646dc9ef4bfbf63da0fa3.tar.gz serverdata-6f11fba50c92d937689646dc9ef4bfbf63da0fa3.tar.bz2 serverdata-6f11fba50c92d937689646dc9ef4bfbf63da0fa3.tar.xz serverdata-6f11fba50c92d937689646dc9ef4bfbf63da0fa3.zip |
Move local imports to the end of the main files
This makes it easier to overwrite existing values. It also removes an
unused import.
Diffstat (limited to 'conf/char_athena.conf')
-rw-r--r-- | conf/char_athena.conf | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/conf/char_athena.conf b/conf/char_athena.conf index 6b9e8a5f..c7b14429 100644 --- a/conf/char_athena.conf +++ b/conf/char_athena.conf @@ -1,9 +1,5 @@ // Athena Character configuration file. -// local settings for this server in this file -import: conf/char_local.conf - - // Option to force a player to create an e-mail. // If a player have default e-mail, and if you activate this option, the player can only connect in the game (to arrive on a map) like follow: // - Create at least 1 character @@ -123,3 +119,5 @@ anti_freeze_interval: 6 // If you want use an additional configuration file, uncomment and use this parameter //import: path/additional_configuration_file +// local settings for this server in this file +import: conf/char_local.conf |