add gitattributes file

digerata · Apr 22, 2016 · 1b083d6 · 1b083d6
1 parent 23f2b47
commit 1b083d6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+CHANGELOG.md merge=union
+