diff options
| author | Berke Viktor <berkeviktor@aol.com> | 2012-02-04 16:23:02 +0100 |
|---|---|---|
| committer | Berke Viktor <berkeviktor@aol.com> | 2012-02-04 16:23:02 +0100 |
| commit | a6230d9e00bf55725195572094bb7f1372cc93a8 (patch) | |
| tree | fe7643c39f704cbc7e41736979dbaf2a4ad0ead1 /src | |
| parent | 99b9c1f0b20d2ed896cb930c0213e0d6f28a5b10 (diff) | |
fix compilation error on Linux due to bad merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/server.c b/src/common/server.c index 75b2e005..657030ba 100644 --- a/src/common/server.c +++ b/src/common/server.c @@ -1511,7 +1511,7 @@ server_child (server * serv) if (FALSE) ; #ifdef USE_LIBPROXY - } else if (prefs.proxy_type == 5) + else if (prefs.proxy_type == 5) { char **proxy_list; char *url, *proxy; |