move to PHP-7.4 as current GA

[m6w6/ext-http] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 40a888438919e2b134fc35b8e5f61398e071a488..ffc24946fc8323688f7ea273e43f7dc87cca22ca 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,5 @@
 package.xml            merge=touch
-php_http.h             merge=touc
+php_http.h             merge=touch
+CHANGELOG.md   merge=touch
+.travis.yml            merge=touch
+/tests/data/bug71719.bin       -diff -text