From 525ad1cfc5e073a87461d18b35a1771537e40261 Mon Sep 17 00:00:00 2001 From: Vasily Date: Fri, 11 Jan 2019 20:06:35 +0300 Subject: [PATCH] Set union merge for CONTRIBUTORS.md --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..80f9bc36ed --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/CONTRIBUTORS.md merge=union