projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
| inline |
side by side
(parent:
525371f
)
remove conflict marker
author
Michael Wallner
<mike@php.net>
Sat, 13 Feb 2016 08:07:12 +0000
(09:07 +0100)
committer
Michael 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
473dc2f
..
6d4a56b
100644
(file)
--- a/
README.md
+++ b/
README.md
@@
-2,7
+2,6
@@
[](https://travis-ci.org/m6w6/ext-http)
[](https://gitter.im/m6w6/ext-http)
->>>>>>> v2.5.x
Extended HTTP support. Again.