From 6f11fba50c92d937689646dc9ef4bfbf63da0fa3 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Thu, 13 Nov 2008 18:15:23 +0000 Subject: Move local imports to the end of the main files This makes it easier to overwrite existing values. It also removes an unused import. --- conf/char_athena.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'conf/char_athena.conf') 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 -- cgit v1.2.3-60-g2f50