administrativa

[m6w6/ext-propro] / .gitattributes

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