diff options
| author | Jaime <jaime.frio@gmail.com> | 2016-02-13 08:25:13 +0100 |
|---|---|---|
| committer | Jaime <jaime.frio@gmail.com> | 2016-02-13 08:25:13 +0100 |
| commit | db0304e4fe483a9d591424b35affd0d0e197000d (patch) | |
| tree | 5317015b105bd23cb7b80abb3ed195ed794da989 /numpy/lib/tests/test_stride_tricks.py | |
| parent | 47b6c2b8bacb510cac62d490c159ec116080d1d0 (diff) | |
| parent | 92819d88c9bc1722bb7b0386b65073559bd30492 (diff) | |
| download | numpy-db0304e4fe483a9d591424b35affd0d0e197000d.tar.gz | |
Merge pull request #7239 from madphysicist/patch-1
DOC: Removed residual merge markup from previous commit
Diffstat (limited to 'numpy/lib/tests/test_stride_tricks.py')
0 files changed, 0 insertions, 0 deletions