diff options
| author | Adam <Adam@drink-coca-cola.info> | 2010-05-11 14:36:53 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-06-18 21:01:17 -0400 |
| commit | e6263dba84b80f03d02c379ace081e602f8ef199 (patch) | |
| tree | a6d055b24245e47b1f6c4973c4502937ecabd751 /src/protocol/inspircd12.cpp | |
| parent | 631d11d6a81e8c5f63a19fc279606a61ab1a0563 (diff) | |
Allow attaching metadata to nickrequests and storing it in the databases and fixed windows build
Diffstat (limited to 'src/protocol/inspircd12.cpp')
| -rw-r--r-- | src/protocol/inspircd12.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index 22a143493..5e20edb6f 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -1113,11 +1113,7 @@ int anope_event_capab(const char *source, int ac, const char **av) ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKICK, "CMODE_NOKICK", 'Q')); continue; case 'R': -<<<<<<< HEAD - ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, 'R')); -======= ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", 'R')); ->>>>>>> modes continue; case 'S': ModeManager::AddChannelMode(new ChannelMode(CMODE_STRIPCOLOR, "CMODE_STRIPCOLOR", 'S')); |