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

index e52f7ca..40a8884 100644 (file)
@@ -1 +1,2 @@
 package.xml            merge=touch
+php_http.h             merge=touc