prepare release 2.1.5

[m6w6/ext-pq] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 4ae09e12bb0ecdb16ad7d518bf792ecd913064db..29df74b84ddda6945d34a7c2c9ba34f2d1597124 100644 (file)
--- 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