1
0
mirror of https://github.com/anope/anope.git synced 2026-07-05 04:33:12 +02:00

Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9

Conflicts:
	include/config.h
This commit is contained in:
Naram Qashat
2010-06-20 18:51:03 -04:00
7 changed files with 104 additions and 23 deletions
-2
View File
@@ -461,8 +461,6 @@ class ServerConfig
/* The hostname if services clients */
char *ServiceHost;
/* Help channel, ops here get usermode +h **/
char *HelpChannel;
/* Log channel */
char *LogChannel;
/* Name of the network were on */