Merge CHANGELOG with union

lyft · Nov 13, 2016 · aa9cd3f · aa9cd3f
1 parent 69c7e96
commit aa9cd3f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union