X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=README.md;h=473dc2f04a9dc06cdf11564f985cf602697d40e1;hp=6d4a56bcfe2f3a9ab23c01c58970f826c2b15331;hb=d7d868e74c34f1e0e3c4564f5b351572aadb6454;hpb=e4896f4169a9589db7131ff4b7d9ed37e0e0ace8

diff --git a/README.md b/README.md
index 6d4a56b..473dc2f 100644
--- 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.