X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=.gitattributes;h=b0aef47cbde05ad2cc0e39899c08abc18ef08d57;hb=fb930d49aa0d85ff65bdeb703851dc96a4e79093;hp=a55a7ae95546df79042da73d8e32162b575db1ff;hpb=2240fb6678019ad6b5dc9c37cfb454f5e57600bd;p=m6w6%2Fext-http

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