From ebe899442e6cd9d72a18ae0ebcb2455b9ccbaf96 Mon Sep 17 00:00:00 2001
From: idgserpro <idgserpro@users.noreply.github.com>
Date: Mon, 24 Oct 2016 15:46:58 -0200
Subject: [PATCH] Minimizar conflitos em merge.

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..6f9ff67
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGES.rst merge=union