diff options
| author | smokexyz <sagunkho@hotmail.com> | 2017-07-04 20:08:12 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-04 20:08:12 +0530 |
| commit | 181b1ff7960fb7ddfc9d8519471bc2a97b6fd22b (patch) | |
| tree | f23ccdded8f9d819c92bbdf913e00209b54262fd | |
| parent | a4c9508bcc252b8601821a042e522d232ea19857 (diff) | |
| parent | 6d88c6c740c66f8c34fa2993832e1b43578197c9 (diff) | |
| download | hercules-181b1ff7960fb7ddfc9d8519471bc2a97b6fd22b.tar.gz hercules-181b1ff7960fb7ddfc9d8519471bc2a97b6fd22b.tar.bz2 hercules-181b1ff7960fb7ddfc9d8519471bc2a97b6fd22b.tar.xz hercules-181b1ff7960fb7ddfc9d8519471bc2a97b6fd22b.zip | |
Merge pull request #1780 from dastgir/bug/battle_config
fixes reading battle.conf multiple times
| -rw-r--r-- | conf/map/battle.conf | 4 |
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" |