touch merge travis.yml

diff --git a/.gitattributes b/.gitattributes
index 8d1a06c88d1a730cf666fc6751c8d3c9c24b3866..397f473f1286500e4edb395e38c854da760d697e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 package.xml            merge=touch
 php_pq.h               merge=touch
+.travis.yml            merge=touch