merge NEWS.md with union (#656)

AshesITR · MichaelChirico · web-flow · commit b92cf0d52c53 · 2020-12-04T10:43:16.000-05:00
fixes #655 Co-authored-by: Michael Chirico <michaelchirico4@gmail.com>
diff --git a/.gitattributes b/.gitattributes
@@ -2,3 +2,4 @@ DESCRIPTION eol=lf
 NAMESPACE eol=lf
 *R text eol=lf
 *Rd text eol=lf
+NEWS.md text merge=union eol=lf
