X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=ffc24946fc8323688f7ea273e43f7dc87cca22ca;hp=715993274e64dc0ea64acddd9c2faa567e2e5a9b;hb=f94c237788db6949e7ea63f360ad45412de50267;hpb=e57370d1f00da9e12de0917a9f907281ab8e84b5

diff --git a/.gitattributes b/.gitattributes
index 7159932..ffc2494 100644
--- 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