From: Michael Wallner <mike@php.net>
Date: Sat, 13 Feb 2016 08:07:12 +0000 (+0100)
Subject: remove conflict marker
X-Git-Tag: RELEASE_3_0_1~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=45dfbc4e19232105da306b0028387a5d354bec93;p=m6w6%2Fext-http

remove conflict marker
[ci skip]
---

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.