blob: dad6dde37cd0fc6ebc4856423cbd194fd8a7a704 [file] [log] [blame]
# Numerical data files
numpy/lib/tests/data/*.npy binary
# Release notes, reduce number of conflicts.
doc/release/*.rst merge=union