Change merge driver for Changelog.md to union

See rubocop/rubocop#3594 for context on what this is and how it works
zencargo · Oct 17, 2016 · de5fb37 · de5fb37
1 parent 0b91b38
commit de5fb37
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+Changelog.md merge=union