X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=.gitattributes;h=397f473f1286500e4edb395e38c854da760d697e;hp=8d1a06c88d1a730cf666fc6751c8d3c9c24b3866;hb=d95fcef57753d177c8451795396835546b7973b8;hpb=8a3f952112669bc5e393770b1b53c185a9ae6307

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