touch merge travis.yml
authorMichael Wallner <mike@php.net>
Fri, 4 Dec 2015 14:07:27 +0000 (15:07 +0100)
committerMichael Wallner <mike@php.net>
Fri, 4 Dec 2015 14:07:27 +0000 (15:07 +0100)
.gitattributes

index 8d1a06c..397f473 100644 (file)
@@ -1,2 +1,3 @@
 package.xml            merge=touch
 php_pq.h               merge=touch
+.travis.yml            merge=touch