Fix PHP7 config.w32

[m6w6/ext-http] / README.md

diff --git a/README.md b/README.md
index 6d4a56bcfe2f3a9ab23c01c58970f826c2b15331..473dc2f04a9dc06cdf11564f985cf602697d40e1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/m6w6/ext-http.svg?branch=master)](https://travis-ci.org/m6w6/ext-http)
 [![Join the chat at https://gitter.im/m6w6/ext-http](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/m6w6/ext-http)
+>>>>>>> v2.5.x
 
 Extended HTTP support. Again.