From ab0a842820c3fd9a94334bdb388ffe179232afeb Mon Sep 17 00:00:00 2001
From: Ates Goral <ates.g@myplanet.com>
Date: Fri, 13 Nov 2015 23:18:53 -0500
Subject: [PATCH] Set merge style of themes to union

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..b3a7654
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+data/themes.yml  merge=union