Fix conflicts from upstream merge

Georg Hopp
2 parents 7a3343c8 7272bb6c
Showing 1 changed file with 1 additions and 1 deletions
src/http/response.c
--- a/src/http/response.c
View file @20cbe7f
+++ b/src/http/response.c
View file @20cbe7f
@@ -58,7 +58,7 @@ httpResponseDtor(void * _this)
 	TR_MEM_FREE(this->reason);
 
 	TR_PARENTCALL(TR_HttpResponse, _this, TR_Class, dtor);
-} 
+}
 
 static
 size_t