summaryrefslogtreecommitdiff
path: root/numpy/doc/glossary.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2017-11-13 07:02:22 -0700
committerGitHub <noreply@github.com>2017-11-13 07:02:22 -0700
commite06ec341dbcd752d0f9b263ad45553c82d8b32ac (patch)
tree925c06e6e97052fad76747f534e1559cce9415ad /numpy/doc/glossary.py
parentf81dfcc75483fe7489cc021f92e9fe2c0a5d0fa8 (diff)
parentae338e4c7deb4268ed9122b8dd4922424eacd58f (diff)
downloadnumpy-e06ec341dbcd752d0f9b263ad45553c82d8b32ac.tar.gz
Merge pull request #10017 from eric-wieser/revert-8981-rebase
REV: Undo bad rebase in 7fdfdd6a52fc0761c0d45931247c5ed2480224eb (#8981)
Diffstat (limited to 'numpy/doc/glossary.py')
0 files changed, 0 insertions, 0 deletions