aboutsummaryrefslogtreecommitdiff
path: root/contrib/conf_merge
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2014-11-10 20:57:39 +0000
committerDDuarte <dnpd.dd@gmail.com>2014-11-10 20:57:39 +0000
commit90c53e8c84b6a7b4346bda8087be8d14d0902d1a (patch)
tree440106833555d60ebf7a3a042449fd80250c2e2f /contrib/conf_merge
parente90ef4fa24a1da7f4d7433a1522e5cb43ef68d29 (diff)
Core: Nuke authserver
It has been replaced by bnetserver since grunt was deprecated
Diffstat (limited to 'contrib/conf_merge')
-rw-r--r--contrib/conf_merge/README2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/conf_merge/README b/contrib/conf_merge/README
index 974c1063064..9e6b1e1546c 100644
--- a/contrib/conf_merge/README
+++ b/contrib/conf_merge/README
@@ -1,6 +1,6 @@
==== PHP merger (index.php + merge.php) ====
-This is a PHP script for merging a new .dist file with your existing .conf file (worldserver.conf.dist and authserver.conf.dist)
+This is a PHP script for merging a new .dist file with your existing .conf file (worldserver.conf.dist and bnetserver.conf.dist)
It should also work with mangos dist/conf files as well.
It uses sessions so it is multi user safe, it adds any options that are removed to the bottom of the file,