X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=b0aef47cbde05ad2cc0e39899c08abc18ef08d57;hp=a55a7ae95546df79042da73d8e32162b575db1ff;hb=688a70d8590cc4cac2d39f24baf8d99ebd9fec06;hpb=1d87e15edcbcf4b16c5a1aa80ce69229eedb3468

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