projects / m6w6 / ext-http / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree | github
raw | patch | inline | side by side (parent: 525371f)
remove conflict marker
authorMichael Wallner <mike@php.net>
Sat, 13 Feb 2016 08:07:12 +0000 (09:07 +0100)
committerMichael Wallner <mike@php.net>
Sat, 13 Feb 2016 08:07:12 +0000 (09:07 +0100)
[ci skip]

README.md patch | blob | history

diff --git a/README.md b/README.md
index 473dc2f04a9dc06cdf11564f985cf602697d40e1..6d4a56bcfe2f3a9ab23c01c58970f826c2b15331 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.
 
Extended HTTP Support