Fix merge error in llurlrequest.cpp.

Nicky 2014-06-10 10:50:47 +02:00
parent 87d479e723
commit ec8aac269f
1 changed files with 1 additions and 1 deletions

View File

@ -251,7 +251,7 @@ void LLURLRequest::useProxy(bool use_proxy)
}
}
LL_DEBUGS()("Proxy") << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << (env_proxy ? env_proxy : "(null)") << LL_ENDL;
LL_DEBUGS("Proxy") << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << (env_proxy ? env_proxy : "(null)") << LL_ENDL;
if (env_proxy && use_proxy)
{