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 /modules/core/cs_access.cpp | |
parent | dbc19768b17545a65704752f04612a0b1b61f209 (diff) |
removed a merge conflict in example.conf
Diffstat (limited to 'modules/core/cs_access.cpp')
0 files changed, 0 insertions, 0 deletions