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/nanfunctions.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/nanfunctions.py')
| -rw-r--r-- | numpy/lib/nanfunctions.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/numpy/lib/nanfunctions.py b/numpy/lib/nanfunctions.py index 56f0010af..b963abb21 100644 --- a/numpy/lib/nanfunctions.py +++ b/numpy/lib/nanfunctions.py @@ -919,21 +919,15 @@ def nanpercentile(a, q, axis=None, out=None, overwrite_input=False, * nearest: ``i`` or ``j``, whichever is nearest. * midpoint: ``(i + j) / 2``. keepdims : bool, optional -<<<<<<< 35b5f5be1ffffada84c8be207e7b8b196a58f786 If this is set to True, the axes which are reduced are left in the result as dimensions with size one. With this option, the result will broadcast correctly against the original array `a`. -======= - If this is set to True, the axes which are reduced are left - in the result as dimensions with size one. With this option, - the result will broadcast correctly against the original `a`. If this is anything but the default value it will be passed through (in the special case of an empty array) to the `mean` function of the underlying array. If the array is a sub-class and `mean` does not have the kwarg `keepdims` this will raise a RuntimeError. ->>>>>>> BUG: many functions silently drop `keepdims` kwarg Returns ------- |