# Reduce the number of merge conflicts
doc/whatsnew.rst merge=union
*.zip filter=lfs diff=lfs merge=lfs -text
