X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=b0aef47cbde05ad2cc0e39899c08abc18ef08d57;hp=e52f7caa2e393a763542c4c0b8df6bdf6a728658;hb=c181d781fad73ca1c2adddda0bc45012844e9779;hpb=bc03617327a193d5222ad045e096bc2b8abb6f97

diff --git a/.gitattributes b/.gitattributes
index e52f7ca..b0aef47 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
 package.xml		merge=touch
+php_http.h		merge=touch
+.travis.yml		merge=touch