diff options
| author | DukePyrolator <DukePyrolator@anope.org> | 2011-03-26 18:11:15 +0100 |
|---|---|---|
| committer | DukePyrolator <DukePyrolator@anope.org> | 2011-03-26 18:11:15 +0100 |
| commit | d0746ae8d634839632ce25246897963b3509b2d9 (patch) | |
| tree | acb3bbf6bcdbd75ab0ac03f5d64cbfb18cdeee3b | |
| parent | dbc19768b17545a65704752f04612a0b1b61f209 (diff) | |
removed a merge conflict in example.conf
| -rw-r--r-- | data/example.conf | 8 |
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 |