diff options
| author | Naram Qashat <cyberbotx@cyberbotx.com> | 2010-06-20 18:51:03 -0400 |
|---|---|---|
| committer | Naram Qashat <cyberbotx@cyberbotx.com> | 2010-06-20 18:51:03 -0400 |
| commit | 63d7bee2a65c6d389219e5bc09d0fdf4f357b9a1 (patch) | |
| tree | 595c9c0d05539b7418b04595e231665479a2d2b0 /src/config.cpp | |
| parent | 381c9c8870fad4c544f29deec22ba4be3549a731 (diff) | |
| parent | e8a1570ed9f7b839a361169c141956978348acf8 (diff) | |
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Conflicts:
include/config.h
Diffstat (limited to 'src/config.cpp')
| -rw-r--r-- | src/config.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/config.cpp b/src/config.cpp index da1ec1647..93a65f9ba 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -620,7 +620,6 @@ int ServerConfig::Read(bool bail) {"serverinfo", "hostname", "", new ValueContainerChar(&Config.ServiceHost), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"serverinfo", "pid", "services.pid", new ValueContainerChar(&Config.PIDFilename), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"serverinfo", "motd", "services.motd", new ValueContainerChar(&Config.MOTDFilename), DT_CHARPTR, ValidateNotEmpty}, - {"networkinfo", "helpchannel", "", new ValueContainerChar(&Config.HelpChannel), DT_CHARPTR, NoValidation}, {"networkinfo", "logchannel", "", new ValueContainerChar(&Config.LogChannel), DT_CHARPTR, NoValidation}, {"networkinfo", "logbot", "no", new ValueContainerBool(&Config.LogBot), DT_BOOLEAN, NoValidation}, {"networkinfo", "networkname", "", new ValueContainerChar(&Config.NetworkName), DT_CHARPTR, ValidateNotEmpty}, |