test fixups from Remi
[m6w6/ext-http] / .gitattributes
1 package.xml merge=touch
2 php_http.h merge=touch
3 .travis.yml merge=touch