fix conflict

This commit is contained in:
minggo
2021-11-30 10:48:30 +08:00
348 changed files with 16674 additions and 6819 deletions
+1 -1
View File
@@ -584,7 +584,7 @@ private: // NOLINT(readability-redundant-access-specifiers)
// Process Response
void HttpClient::processResponse(HttpResponse *response, char *responseMessage) {
auto* request = response->getHttpRequest();
auto * request = response->getHttpRequest();
HttpRequest::Type requestType = request->getRequestType();
if (HttpRequest::Type::GET != requestType &&