projects / m6w6 / ext-http / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree | github
raw | patch | inline | side by side (parent: a92f356)
merge php_http.h with touch
authorMichael Wallner <mike@php.net>
Fri, 4 Apr 2014 12:12:05 +0000 (14:12 +0200)
committerMichael Wallner <mike@php.net>
Fri, 4 Apr 2014 12:12:05 +0000 (14:12 +0200)
.gitattributes patch | blob | history

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