From d20337281b8afe553b44fce4128142c680ffb7b0 Mon Sep 17 00:00:00 2001
From: Michael Kohl <citizen428@forem.com>
Date: Thu, 14 Oct 2021 10:51:09 +0700
Subject: [PATCH] Enable union merges for translations (#15061)

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index aaf24388c..e63d80307 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,4 @@
 *.html diff=html
 *.erb  diff=html
 /CHANGELOG.md merge=union
+config/locales/*.yml merge=union