summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-25 23:13:57 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-25 23:13:57 +0300
commitdf334ed89823b7b2ff855c30a21226b8f72d55a5 (patch)
treeb7ca24692a3ebd8b4279e818e6b5f6e163c1e3bb /conf
parent4b1e21eaaadca7dc8869ad543ab4cb1cc242fb89 (diff)
downloadserverdata-df334ed89823b7b2ff855c30a21226b8f72d55a5.tar.gz
serverdata-df334ed89823b7b2ff855c30a21226b8f72d55a5.tar.bz2
serverdata-df334ed89823b7b2ff855c30a21226b8f72d55a5.tar.xz
serverdata-df334ed89823b7b2ff855c30a21226b8f72d55a5.zip
Update conf files after hercules update.
Diffstat (limited to 'conf')
-rw-r--r--conf/map/battle.conf4
1 files changed, 1 insertions, 3 deletions
diff --git a/conf/map/battle.conf b/conf/map/battle.conf
index f17748fb..927b82b0 100644
--- a/conf/map/battle.conf
+++ b/conf/map/battle.conf
@@ -79,9 +79,7 @@ battle_configuration: {
// Anything else that didn't fit anywhere else.
// Includes duel, day/night, mute/manner, log settings.
@include "conf/map/battle/misc.conf"
-
- // Your custom config goes here.
- @include "conf/import/battle.conf"
}
+ // Your custom config goes here.
import: "conf/import/battle.conf"