Merge branch 'v2.6.x'

[m6w6/ext-http] / README.md

diff --git a/README.md b/README.md
index 473dc2f04a9dc06cdf11564f985cf602697d40e1..96a7b313b070ab1b4f76602fbfde3912bf907bab 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 
 [![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.
 
@@ -21,7 +20,7 @@ Known issues are listed in [BUGS](./BUGS) and future ideas can be found in [TODO
 ### PHARext
 
 Watch out for [PECL replicates](https://replicator.pharext.org?pecl_http)
-and pharext packages attached to [releases](./releases).
+and pharext packages attached to [releases](https://github.com/m6w6/ext-http/releases).
 
 ### Checkout