X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=.gitattributes;fp=.gitattributes;h=4ae09e12bb0ecdb16ad7d518bf792ecd913064db;hp=0000000000000000000000000000000000000000;hb=19160ec30c5885a557ea49acec4e236f58eaddd9;hpb=bffdeef967c851f5046a1dbed426f45611e507d0

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..4ae09e1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+package.xml		merge=touch
+php_pq.g		merge=touch