diff options
| author | Stephan Hoyer <shoyer@google.com> | 2019-05-13 08:09:26 -0700 |
|---|---|---|
| committer | Stephan Hoyer <shoyer@google.com> | 2019-05-13 08:09:26 -0700 |
| commit | 07452c86c78a1cf213a764d17f060b4887ec3681 (patch) | |
| tree | 12c7ae7b14552bd28334277e7e244b603ca4300a /numpy/core/shape_base.py | |
| parent | 804f71bb42fef775a85a52366dc4bd1a22c130a8 (diff) | |
| parent | 4ad33d21b1a30f931e23307e9f9355b70f633bed (diff) | |
| download | numpy-07452c86c78a1cf213a764d17f060b4887ec3681.tar.gz | |
Merge branch 'master' into implement-numpy-implementation
Diffstat (limited to 'numpy/core/shape_base.py')
| -rw-r--r-- | numpy/core/shape_base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/shape_base.py b/numpy/core/shape_base.py index 0eac772e8..3a037e7d2 100644 --- a/numpy/core/shape_base.py +++ b/numpy/core/shape_base.py @@ -832,7 +832,7 @@ def block(arrays): # Theses helper functions are mostly used for testing. # They allow us to write tests that directly call `_block_slicing` -# or `_block_concatenate` wtihout blocking large arrays to forse the wisdom +# or `_block_concatenate` without blocking large arrays to forse the wisdom # to trigger the desired path. def _block_setup(arrays): """ |