Set merge strategy for the news file

tidyverse · Jun 8, 2016 · 1a42497 · 1a42497
1 parent 9b75201
commit 1a42497
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/NEWS.md merge=union