Merge pull request #21 from Jan-E/master
[m6w6/ext-http] / README.md
index e629326deb66ec0dd1e4da6f0a4051a8961ed044..473dc2f04a9dc06cdf11564f985cf602697d40e1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # 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?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 [![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.