Merge pull request #1264 from shoyer/whats-new-union

Reduce merge conflicts in whats-new.rst
pydata · Feb 17, 2017 · 7e0abe5 · 7e0abe5
2 parents 6233320 + 02ff598
commit 7e0abe5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# reduce the number of merge conflicts
+doc/whats-new.rst merge=union