From 5985739e72131d7cb8a70d8e01b07fa42b29dd1d Mon Sep 17 00:00:00 2001 From: Alex Macleod Date: Sun, 4 Oct 2020 21:57:22 +0100 Subject: [PATCH] Mark generated files as binary This supresses local text diffs and prevents git from trying to automatically resolve merge conflicts within the files --- .gitattributes | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 9fd591a..c9ac1f6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,7 +5,7 @@ xlsx*.js text eol=lf *.flow.js text eol=lf docbits/* linguist-documentation -dist/* linguist-generated=true -xlsx.js linguist-generated=true -xlsxworker.js linguist-generated=true -tests/core.js linguist-generated=true +dist/* linguist-generated=true binary +xlsx.js linguist-generated=true binary +xlsxworker.js linguist-generated=true binary +tests/core.js linguist-generated=true binary