From: Michael Wallner <mike@php.net>
Date: Fri, 4 Apr 2014 12:14:43 +0000 (+0200)
Subject: typo
X-Git-Tag: RELEASE_2_1_0_RC1~40
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=592daae2e94814c46f2d961c630a36483072e9e2;p=m6w6%2Fext-http

typo
---

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