aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2012-11-09 09:03:29 +0100
committerSpp <spp@jorge.gr>2012-11-09 09:03:29 +0100
commitccf593c6738ad1073381f1c2d404664e8d4ea187 (patch)
treeaed45faab77812b149be4cfb2384122d7d3a0055 /src/server/worldserver
parent35d63a97990528d5496598cc5893be141649f308 (diff)
Fix merge conflic and typos in worldserver config file and characters.sql
Diffstat (limited to 'src/server/worldserver')
-rw-r--r--src/server/worldserver/worldserver.conf.dist4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 0cb6072c244..650695a1397 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -985,14 +985,14 @@ Guild.ResetHour = 6
Guild.BankEventLogRecordsCount = 25
#
-# Guild.Guild.NewsLogRecordsCount
+# Guild.NewsLogRecordsCount
# Description: Number of log entries for guild news that are stored per guild. Old
# entries will be overwritten if the number of log entries exceed the
# configured value. High numbers prevent this behavior but may have performance
# impacts.
# Default: 250
-Guild.Guild.NewsLogRecordsCount = 250
+Guild.NewsLogRecordsCount = 250
#
# MaxPrimaryTradeSkill