diff --git a/.gitattributes b/.gitattributes
index 3debd6573fa..5c0818c0915 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,3 @@ gradlew eol=lf
 *.sh eol=lf
 
 CHANGELOG.md merge=union
-src/main/resources/l10n/*.properties merge=union