From: Michael Wallner <mike@php.net>
Date: Fri, 17 Jan 2014 15:37:56 +0000 (+0100)
Subject: gitattributes
X-Git-Tag: RELEASE_2_1_0_RC1~44
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=bc03617327a193d5222ad045e096bc2b8abb6f97;p=m6w6%2Fext-http

gitattributes
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..e52f7ca
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+package.xml		merge=touch