Remove UnRestrictSAdmin.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1738 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 5 insertions, 4 deletions

diff --git a/src/config.c b/src/config.c
index 54aa6adb1..7f741d60e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -293,10 +293,7 @@ long unsigned int UserKey2;
 long unsigned int UserKey3;
 
 char *Numeric;
-
-int UnRestrictSAdmin;
-
-static char *UlineServers;
+char *UlineServers;
 char **Ulines;
 int NumUlines;
 
@@ -1396,7 +1393,11 @@ Directive directives[] = {
 					   {PARAM_STRING, 0, &RemotePassword3}}},
 	{"UseSVSHOLD", {{PARAM_SET, PARAM_RELOAD, &UseSVSHOLD}}},
 	{"UseTS6", {{PARAM_SET, 0, &UseTS6}}},
+<<<<<<< HEAD:src/config.c
 	{"UnRestrictSAdmin", {{PARAM_SET, PARAM_RELOAD, &UnRestrictSAdmin}}},
+=======
+	{"UlineServers", {{PARAM_STRING, PARAM_RELOAD, &UlineServers}}},
+>>>>>>> Remove UnRestrictSAdmin.:src/config.c
 };
 
 /*************************************************************************/