Permalink
Switch branches/tags
Find file
Fetching contributors…
Cannot retrieve contributors at this time
6 lines (4 sloc) 133 Bytes
# Numerical data files
numpy/lib/tests/data/*.npy binary
# Release notes, reduce number of conflicts.
doc/release/*.rst merge=union