Automated merge with ssh://shadowircd/uranium/shadowircd/

This commit is contained in:
B.Greenham 2010-03-08 18:09:35 -05:00
commit 3a68f97851
1 changed files with 8 additions and 8 deletions

View File

@ -635,13 +635,13 @@ static struct InfoStruct info_table[] = {
{ {
"resv_forcepart", "resv_forcepart",
OUTPUT_BOOLEAN_YN, OUTPUT_BOOLEAN_YN,
{ &ConfigChannel.resv_forcepart }, &ConfigChannel.resv_forcepart,
"Force-part local users on channel RESV" "Force-part local users on channel RESV"
}, },
{ {
"kick_no_rejoin_time", "kick_no_rejoin_time",
OUTPUT_DECIMAL, OUTPUT_DECIMAL,
{ &ConfigChannel.kick_no_rejoin_time }, &ConfigChannel.kick_no_rejoin_time,
"The amount of time that a user cannot rejoin a +J channel for after being kicked." "The amount of time that a user cannot rejoin a +J channel for after being kicked."
}, },
{ {