X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=.gitattributes;h=8b608050fe20c19850b68c6b452c06b37467d493;hp=29df74b84ddda6945d34a7c2c9ba34f2d1597124;hb=2bff1a14bb1eb2a8a0c77c75b12e809908812eeb;hpb=f377b7c11ae28b9c69cecd53ac2e6633fc5140b2

diff --git a/.gitattributes b/.gitattributes
index 29df74b..8b60805 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,3 @@
 package.xml		merge=touch
 php_pq.h		merge=touch
-.travis.yml		merge=touch
 *.phar			binary