From 45dfbc4e19232105da306b0028387a5d354bec93 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Sat, 13 Feb 2016 09:07:12 +0100 Subject: [PATCH] remove conflict marker [ci skip] --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 473dc2f..6d4a56b 100644 --- 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. -- 2.30.2