From 592daae2e94814c46f2d961c630a36483072e9e2 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 4 Apr 2014 14:14:43 +0200
Subject: [PATCH] typo

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

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