From: Michael Wallner <mike@php.net>
Date: Fri, 4 Apr 2014 12:12:05 +0000 (+0200)
Subject: merge php_http.h with touch
X-Git-Tag: RELEASE_2_1_0_RC1~42
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=61279745dda8d178a049a71d9f8b8fce0f245ab3;p=m6w6%2Fext-http

merge php_http.h with touch
---

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