chore(git): add merge attributes for locale files

This commit is contained in:
MrTimscampi 2020-11-17 19:11:27 +01:00
parent 842c3dc2b5
commit 0702c0b6f9

3
.gitattributes vendored
View File

@ -35,4 +35,5 @@ LICENSE text
.gitignore export-ignore
*.gitattributes linguist-language=gitattributes
api/* linguist-generated=true
api/* linguist-generated=true
locales/*.json merge=union