X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=.gitattributes;h=a55a7ae95546df79042da73d8e32162b575db1ff;hb=caddd8ffdc0b23544671c64df711c04d3da1b4b4;hp=40a888438919e2b134fc35b8e5f61398e071a488;hpb=1ebe4d9f8e3e0d301809b9279ba428ba829b7f17;p=m6w6%2Fext-http

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