From 8db9f86e3f0ecfe59ece7a36ec303bb061fa38cc Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Thu, 11 Aug 2016 21:12:26 +0200
Subject: [PATCH] New attempt with union merge...

---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 0d611d32058..9b3ebff4d8e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,3 +5,6 @@ gradlew eol=lf
 # ensure that line endings of *.java and *.properties are normalized
 *.properties text
 *.java text
+
+CHANGELOG.md merge=union
+src/main/resources/l10n/*.properties merge=union
\ No newline at end of file