Config.w32 chack for both instances of event.h

[m6w6/ext-http] / .gitattributes

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