fix merge by hand

Author: d-a-v

libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h

@@ -242,7 +242,8 @@ class HTTPClient : public Stream
     bool sendHeader(const char * type);
     bool endRequest(void);
     int handleHeaderResponse();
-    int writeToStreamDataBlock(Stream * stream, int len);
+    bool readChunkHeader(bool blocking = true);
+    bool readChunkTrailer(bool blocking = true);
 
     // The common pattern to use the class is to
     // {