summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-20 18:35:30 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-20 18:35:30 +0000
commitbb6a7bf20837a54796965e592af564e1b95bea74 (patch)
tree25b406a32c15d7304fe9f2461526bca6604ff77f /conf
parent374e8946609557514509d958353ee48571b5edcf (diff)
downloadhercules-bb6a7bf20837a54796965e592af564e1b95bea74.tar.gz
hercules-bb6a7bf20837a54796965e592af564e1b95bea74.tar.bz2
hercules-bb6a7bf20837a54796965e592af564e1b95bea74.tar.xz
hercules-bb6a7bf20837a54796965e592af564e1b95bea74.zip
- Partial revert of r15165: commented out "account.sql" settings in login_athena.conf so that it uses the SQL settings from inter_athena.conf (or import/inter_conf.txt)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15190 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
-rw-r--r--conf/login_athena.conf18
1 files changed, 9 insertions, 9 deletions
diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index 11f5bec8a..7f1f40d4b 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -117,15 +117,15 @@ account.engine: auto
account.txt.account_db: save/account.txt
account.txt.case_sensitive: no
// SQL
-account.sql.db_hostname: 127.0.0.1
-account.sql.db_port: 3306
-account.sql.db_username: ragnarok
-account.sql.db_password: ragnarok
-account.sql.db_database: ragnarok
-account.sql.codepage:
-account.sql.case_sensitive: no
-account.sql.account_db: login
-account.sql.accreg_db: global_reg_value
+//account.sql.db_hostname: 127.0.0.1
+//account.sql.db_port: 3306
+//account.sql.db_username: ragnarok
+//account.sql.db_password: ragnarok
+//account.sql.db_database: ragnarok
+//account.sql.codepage:
+//account.sql.case_sensitive: no
+//account.sql.account_db: login
+//account.sql.accreg_db: global_reg_value
import: conf/inter_athena.conf
import: conf/import/login_conf.txt