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

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