merge php_http.h with touch

[m6w6/ext-http] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index e52f7caa2e393a763542c4c0b8df6bdf6a728658..40a888438919e2b134fc35b8e5f61398e071a488 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 package.xml            merge=touch
+php_http.h             merge=touc