X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=.gitattributes;h=29df74b84ddda6945d34a7c2c9ba34f2d1597124;hp=4ae09e12bb0ecdb16ad7d518bf792ecd913064db;hb=d6c8226407001736e86b4e0328a224e2b6fd1aa3;hpb=19160ec30c5885a557ea49acec4e236f58eaddd9

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