summaryrefslogtreecommitdiff
path: root/conf/battle/misc.conf
diff options
context:
space:
mode:
authorMatias <matiassw@gmail.com>2013-06-25 16:59:44 -0400
committerMatias <matiassw@gmail.com>2013-06-25 16:59:44 -0400
commitb40371d3a0772031d12f2782c10976413c6f34b9 (patch)
tree7aeed5544a9df524a834cc739d3f596b66d6a006 /conf/battle/misc.conf
parent25914bae30eced388cf8640eead19fbb11a65ade (diff)
parent5785dbae3f513da20611e3147dadef2b9c911443 (diff)
downloadhercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.gz
hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.bz2
hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.xz
hercules-b40371d3a0772031d12f2782c10976413c6f34b9.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'conf/battle/misc.conf')
-rw-r--r--conf/battle/misc.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
index 32b9c511e..9814a2140 100644
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -85,7 +85,7 @@ duel_only_on_same_map: no
// Cell Stack Limit support (see src/map/map.h)
cell_stack_limit: 1
-// Allow autrade only in map with autotrade flag?
+// Allow autotrade only in map with autotrade flag?
// Set this to "no" will allow autotrade where no "autotrade" mapflag is set
// Set this to "yes" to only allow autotrade on maps with "autotrade" mapflag
at_mapflag: no