From 3219c30ca05f38a04c07b25097ee3edf311eb938 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Mon, 24 Aug 2020 09:31:56 +0800 Subject: [PATCH] .gitattributes: mark approvals as generated code --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index a298e8004fb..fc3b8fa297d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ CHANGELOG.asciidoc merge=union +*.approved.json linguist-generated +docs/data/**/generated/*.json linguist-generated