gitattributes
authorMichael Wallner <mike@php.net>
Fri, 17 Jan 2014 15:37:56 +0000 (16:37 +0100)
committerMichael Wallner <mike@php.net>
Fri, 17 Jan 2014 15:37:56 +0000 (16:37 +0100)
.gitattributes [new file with mode: 0644]

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