X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=b0aef47cbde05ad2cc0e39899c08abc18ef08d57;hp=40a888438919e2b134fc35b8e5f61398e071a488;hb=1a80f78597fadaabc92b1e760fb26fb919ae2432;hpb=61279745dda8d178a049a71d9f8b8fce0f245ab3

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