add proxy_ssl request options

[m6w6/ext-http] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 715993274e64dc0ea64acddd9c2faa567e2e5a9b..ffc24946fc8323688f7ea273e43f7dc87cca22ca 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +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