X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=715993274e64dc0ea64acddd9c2faa567e2e5a9b;hp=a55a7ae95546df79042da73d8e32162b575db1ff;hb=refs%2Fheads%2Fv2.5.x;hpb=aac4d7b0a183faeeaeb770c0052af68c46d49f18

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