From 61279745dda8d178a049a71d9f8b8fce0f245ab3 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 4 Apr 2014 14:12:05 +0200
Subject: [PATCH] merge php_http.h with touch

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

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
-- 
2.30.2