fix compilation error on Linux due to bad merge
This commit is contained in:
parent
99b9c1f0b2
commit
a6230d9e00
|
@ -1511,7 +1511,7 @@ server_child (server * serv)
|
||||||
if (FALSE)
|
if (FALSE)
|
||||||
;
|
;
|
||||||
#ifdef USE_LIBPROXY
|
#ifdef USE_LIBPROXY
|
||||||
} else if (prefs.proxy_type == 5)
|
else if (prefs.proxy_type == 5)
|
||||||
{
|
{
|
||||||
char **proxy_list;
|
char **proxy_list;
|
||||||
char *url, *proxy;
|
char *url, *proxy;
|
||||||
|
|
Loading…
Reference in New Issue