summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/example.conf8
1 files changed, 0 insertions, 8 deletions
diff --git a/data/example.conf b/data/example.conf
index 9e3ba7369..6a8032f9e 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -470,25 +470,17 @@ options
/*
* If set, Services will hide the IRC operator's nick in a global
-<<<<<<< HEAD
- * message/notice. This directive is optional.
-=======
* message/notice.
*
* This directive is optional.
->>>>>>> 679d3c3... Fixing leftover spaces and other rubbish I missed on the first pass.
*/
#anonymousglobal = yes
/*
* Prevents users from registering their nick if they are not connected
-<<<<<<< HEAD
- * for at least the given number of seconds. This directive is optional.
-=======
* for at least the given number of seconds.
*
* This directive is optional.
->>>>>>> 679d3c3... Fixing leftover spaces and other rubbish I missed on the first pass.
*/
#nickregdelay = 30