X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=.gitattributes;h=a55a7ae95546df79042da73d8e32162b575db1ff;hb=637912166159baa71c9ba73d3d5d7d0773fad7d8;hp=e52f7caa2e393a763542c4c0b8df6bdf6a728658;hpb=a92f3562e87cae473417b4a2c82001ed2a93951d;p=m6w6%2Fext-http

diff --git a/.gitattributes b/.gitattributes
index e52f7ca..a55a7ae 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 package.xml		merge=touch
+php_http.h		merge=touch