summaryrefslogtreecommitdiff
path: root/conf/map_athena.conf
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2008-11-13 18:15:23 +0000
committerJared Adams <jaxad0127@gmail.com>2008-11-13 18:15:23 +0000
commit6f11fba50c92d937689646dc9ef4bfbf63da0fa3 (patch)
treeae325ae391803215f46d8aa934eb4e84e71dee24 /conf/map_athena.conf
parentf9d96008eca02f9b60076221cba77b83a3631f33 (diff)
downloadserverdata-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/map_athena.conf')
-rw-r--r--conf/map_athena.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 6ea1184e..25ea0676 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -1,8 +1,5 @@
// eAthena Map-Server Configuration File
-// local settings for this server in this file
-import: conf/map_local.conf
-
// Maps
map: new_39-1.gat
map: new_38-1.gat
@@ -321,3 +318,6 @@ npc: npc/new_38-1-woodland-mine/receptionist.txt
// Halloween 2008
// npc: npc/halloween/2008/monsters.txt
// npc: npc/halloween/2008/prize_master.txt
+
+// local settings for this server in this file
+import: conf/map_local.conf