diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..0c0ab960a0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CONTRIBUTORS.md merge=union