Fix PHP5 config.w32

[m6w6/ext-http] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index e52f7caa2e393a763542c4c0b8df6bdf6a728658..b0aef47cbde05ad2cc0e39899c08abc18ef08d57 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
 package.xml            merge=touch
+php_http.h             merge=touch
+.travis.yml            merge=touch