Fix conflicts from upstream merge · 20cbe7f43c - taskrambler - Gitea: Git with a cup of tea

Fix conflicts from upstream merge

next

Georg Hopp 10 years ago

parent

7a3343c8c8 7272bb6c7e

commit

20cbe7f43c

1 changed files with 1 additions and 1 deletions

Unified View

								
									2

src/http/response.c

									View File
								
				@ -58,7 +58,7 @@ httpResponseDtor(void * _this)
			
					TR_MEM_FREE(this->reason);
				
					TR_MEM_FREE(this->reason);
			
					TR_PARENTCALL(TR_HttpResponse, _this, TR_Class, dtor);
				
					TR_PARENTCALL(TR_HttpResponse, _this, TR_Class, dtor);
			
				} 
				
				}
			
				static
				
				static
			
				size_t
				
				size_t