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

diff --git a/.gitattributes b/.gitattributes
index 4ae09e1..397f473 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 package.xml		merge=touch
-php_pq.g		merge=touch
+php_pq.h		merge=touch
+.travis.yml		merge=touch