summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/battle_athena.conf3
-rw-r--r--conf/battle_local.conf.example1
2 files changed, 4 insertions, 0 deletions
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index 474fcfd3..79c9de58 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -723,3 +723,6 @@ spam_threshold: 10
// Maximum line lengt, if a message is above chat_maxline, its dropped [1-512]. Default 255.
chat_maxline: 512
+
+// local settings for this server in this file
+import: conf/battle_local.conf
diff --git a/conf/battle_local.conf.example b/conf/battle_local.conf.example
new file mode 100644
index 00000000..c9ba222c
--- /dev/null
+++ b/conf/battle_local.conf.example
@@ -0,0 +1 @@
+// Nothing needs to be done here.