From bc03617327a193d5222ad045e096bc2b8abb6f97 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 17 Jan 2014 16:37:56 +0100
Subject: [PATCH] gitattributes

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .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
-- 
2.30.2