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-2.0.0RC1~13^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=d73c2197351203af6e2f47d1098aa953411e0a6d;hp=--cc;p=m6w6%2Fext-raphf

merge=touch for package meta files
---

d73c2197351203af6e2f47d1098aa953411e0a6d
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