From 41a81ad3cb89f25ebb5af3cd7cb67f25081b7bf0 Mon Sep 17 00:00:00 2001
From: ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 19 Feb 2011 13:23:42 +0000
Subject: * Fixed 'feature.conf' not getting loaded and a typo buying store
 feature setting name (follow up to r14713).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14714 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 conf/battle_athena.conf | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'conf')

diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index 7cf56ce1b..a867382a7 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -62,6 +62,9 @@ import: conf/battle/skill.conf
 //Status change related settings
 import: conf/battle/status.conf
 
+//Feature control (on/off) settings
+import: conf/battle/feature.conf
+
 // Anything else that didn't fit anywhere else.
 // Includes duel, day/night, mute/manner, log settings.
 import: conf/battle/misc.conf
-- 
cgit v1.2.3-60-g2f50