X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.gitattributes;h=715993274e64dc0ea64acddd9c2faa567e2e5a9b;hb=ec71e1dbf561a6ce1b6b46b027f0e013a8dc2209;hp=a55a7ae95546df79042da73d8e32162b575db1ff;hpb=7d5abf6683cab5202710d5e89cd961730f945dcf;p=m6w6%2Fext-http

diff --git a/.gitattributes b/.gitattributes
index a55a7ae..7159932 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,4 @@
 package.xml		merge=touch
 php_http.h		merge=touch
+.travis.yml		merge=touch
+/tests/data/bug71719.bin	-diff -text