prepare v2.2.3

[m6w6/ext-pq] / .gitattributes

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