summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorDastgir <dastgirp@gmail.com>2017-06-13 10:22:47 +0530
committerDastgir <dastgirp@gmail.com>2017-06-13 10:22:47 +0530
commit6d88c6c740c66f8c34fa2993832e1b43578197c9 (patch)
tree3da79542a35addb3b3a1a204f870559771933f78 /conf
parent2f2fe7faf7456edb7e39c2c887d1dc7d2ba3b577 (diff)
downloadhercules-6d88c6c740c66f8c34fa2993832e1b43578197c9.tar.gz
hercules-6d88c6c740c66f8c34fa2993832e1b43578197c9.tar.bz2
hercules-6d88c6c740c66f8c34fa2993832e1b43578197c9.tar.xz
hercules-6d88c6c740c66f8c34fa2993832e1b43578197c9.zip
Removed reading battle.conf multiple times from import folder.
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 f17748fb6..dc978aefc 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"