From: Michael Wallner <mike@php.net>
Date: Tue, 1 Sep 2015 09:01:48 +0000 (+0200)
Subject: merge=touch for package meta files
X-Git-Tag: release-1.1.1RC1~9
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-raphf;a=commitdiff_plain;h=3233c1f56cfce72c079fc2bc033f16c7f4e3fc68

merge=touch for package meta files
---

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