decrease merge conflicts in whatsnew with change to gitattributes file (#310)

wholmgren · web-flow · commit dd7908502cf3 · 2017-02-14T09:22:44.000-07:00
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,4 @@
 pvlib/version.py export-subst
+
+# reduce the number of merge conflicts
+docs/sphinx/source/whatsnew/v*.txt merge=union
