From 681e502c12f5baa3f2da9c9de4a848813a872945 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 10 Aug 2015 19:27:22 -0300
Subject: [PATCH] Use "union" merge strategy for CHANGELOG

Credits: @The-Compiler :smile:
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..242d3da0d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG    merge=union