Use union merge strategy for NEWS

This commit is contained in:
Hadley Wickham 2022-04-20 06:57:35 -05:00
parent 379597de7c
commit 6fc24304a7
1 changed files with 1 additions and 1 deletions

2
.gitattributes vendored
View File

@ -1 +1 @@
/NEWS merge=union
NEWS.md merge=union